[systemd-commits] 2 commits - .gitignore Makefile.am src/core TODO

[Lennart Poettering]

 .gitignore              |    1 +
 Makefile.am             |   11 ++++++++++-
 TODO                    |    4 ++++
 src/core/dbus-manager.c |    4 ++--
 4 files changed, 17 insertions(+), 3 deletions(-)

New commits:
commit ee83acc49b7231b493fd08ac619d09e4a5461f83
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed May 16 03:23:54 2012 +0200

    switch-root: check for absolute paths

diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index 33dcb56..7a06ca6 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -1196,10 +1196,10 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
                                     DBUS_TYPE_INVALID))
                         return bus_send_error_reply(connection, message, &error, -EINVAL);
 
-                if (path_equal(switch_root, "/") || !is_path(switch_root))
+                if (path_equal(switch_root, "/") || !path_is_absolute(switch_root))
                         return bus_send_error_reply(connection, message, NULL, -EINVAL);
 
-                if (!isempty(switch_root_init) && !is_path(switch_root_init))
+                if (!isempty(switch_root_init) && !path_is_absolute(switch_root_init))
                         return bus_send_error_reply(connection, message, NULL, -EINVAL);
 
                 if (m->running_as != MANAGER_SYSTEM) {

commit 27b5482cc08b7fac1b6b15d980d42ae04f3ae1ca
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed May 16 03:23:28 2012 +0200

    delta: add systemd-delta tool to find overriden configuration and unit files

diff --git a/.gitignore b/.gitignore
index e61f1cd..01fba83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/systemd-delta
 /systemd-sleep
 /systemd-inhibit
 /systemd-remount-fs
diff --git a/Makefile.am b/Makefile.am
index 7c1b431..7d6d744 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -214,7 +214,8 @@ bin_PROGRAMS = \
 	systemd-cgtop \
 	systemd-stdio-bridge \
 	systemd-nspawn \
-	systemd-detect-virt
+	systemd-detect-virt \
+	systemd-delta
 
 dist_bin_SCRIPTS = \
 	src/analyze/systemd-analyze
@@ -452,6 +453,7 @@ MANPAGES = \
 	man/systemd.1 \
 	man/systemctl.1 \
 	man/systemd-cgls.1 \
+	man/systemd-delta.1 \
 	man/systemd-cgtop.1 \
 	man/systemd-nspawn.1 \
 	man/systemd-tmpfiles.8 \
@@ -1115,6 +1117,13 @@ systemd_detect_virt_LDADD = \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
+systemd_delta_SOURCES = \
+	src/delta/delta.c
+
+systemd_delta_LDADD = \
+	libsystemd-shared.la
+
+# ------------------------------------------------------------------------------
 systemd_getty_generator_SOURCES = \
 	src/getty-generator/getty-generator.c
 
diff --git a/TODO b/TODO
index 5d18a64..d1756d8 100644
--- a/TODO
+++ b/TODO
@@ -23,6 +23,10 @@ Bugfixes:
 
 Features:
 
+* (attempt to) make Debianites happy:
+        - implement .d/ auto includes for unit files
+        - add syntax to reset ExecStart= lists (and similar)
+
 * actually queue the new default unit after switch-root
 
 * remove old root in switch-root logic