[systemd-commits] 2 commits - TODO tmpfiles.d/etc.conf.m4

[Lennart Poettering]

 TODO                   |    3 +++
 tmpfiles.d/etc.conf.m4 |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit d109a95f3d7f8c5c50d6fd48221791fcc98b4544
Author: Sangjung Woo <sangjung.woo at samsung.com>
Date:   Mon Feb 2 20:25:02 2015 +0900

    tmpfiles: Remove unnecessary blank line when configured with "--disable-resolved"
    
    This patch removes unnecessary blank line in
    /usr/lib/tmpfiles.d/etc.conf when configured with "--disable-resolved".
    (i.e. ENABLE_RESOLVED is not defined)

diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4
index f567c8d..9b0e080 100644
--- a/tmpfiles.d/etc.conf.m4
+++ b/tmpfiles.d/etc.conf.m4
@@ -12,6 +12,6 @@ L /etc/localtime - - - - ../usr/share/zoneinfo/UTC
 L+ /etc/mtab - - - - ../proc/self/mounts
 m4_ifdef(`ENABLE_RESOLVED',
 L /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf
-)
+)m4_dnl
 C /etc/nsswitch.conf - - - -
 C /etc/pam.d - - - -

commit 84bef24dd3ad050bab8ecdcd130d0d9794005fa0
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Feb 2 16:43:00 2015 +0100

    update TODO

diff --git a/TODO b/TODO
index c7b530b..00df87a 100644
--- a/TODO
+++ b/TODO
@@ -34,6 +34,9 @@ External:
 
 Features:
 
+* rework kexec logic to use new kexec_file_load() syscall, so that we
+  don't have to call kexec tool anymore.
+
 * The udev blkid built-in should expose a property that reflects
   whether media was sensed in USB CF/SD card readers. This should then
   be used to control SYSTEMD_READY=1/0 so that USB card readers aren't