[systemd-commits] 4 commits - TODO src/core src/systemctl

[Lennart Poettering]

 TODO                      |    2 ++
 src/core/mount.c          |    3 ++-
 src/core/service.c        |    2 +-
 src/systemctl/systemctl.c |    3 ++-
 4 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 2ce982f9b1a9f409b10fc4c0f3faa6b594b58df9
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jul 18 02:31:06 2013 +0200

    systemctl: also highlight a load state of "not-found" as red
    
    "not-found" is a recently added load state and was previously just a
    special case of "error". Since it also indicates a load error we should
    also highlight it red, the same way as "error" was treated before.

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 9574ff2..6fdbc41 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -381,7 +381,8 @@ static void output_units_list(const struct unit_info *unit_infos, unsigned c) {
 
                 n_shown++;
 
-                if (streq(u->load_state, "error")) {
+                if (streq(u->load_state, "error") ||
+                    streq(u->load_state, "not-found")) {
                         on_loaded = on = ansi_highlight_red(true);
                         off_loaded = off = ansi_highlight_red(false);
                 } else

commit 20422497109aaba1d214f1597530de8b8788a526
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jul 18 02:31:01 2013 +0200

    mount: also exclude /usr from unmount at shutdown

diff --git a/src/core/mount.c b/src/core/mount.c
index 58a3f11..c7d29b0 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -1543,7 +1543,8 @@ static int mount_add_one(
                 if (r < 0)
                         goto fail;
 
-                if (!path_equal(where, "/")) {
+                if (!path_equal(where, "/") &&
+                    !path_equal(where, "/usr")) {
                         r = unit_add_dependency_by_name(u, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true);
                         if (r < 0)
                                 goto fail;

commit c3bb87dbab8b79bb9253407cb5b7f3e6fe8db395
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jul 18 02:29:06 2013 +0200

    update TODO

diff --git a/TODO b/TODO
index ac5ae71..4b75539 100644
--- a/TODO
+++ b/TODO
@@ -56,6 +56,8 @@ CGroup Rework Completion:
 
 Features:
 
+* btfs raid assembly: some .device jobs stay stuck in the queue
+
 * Fedora: add an rpmlint check that verifies that all unit files in the RPM are listed in %systemd_post macros.
 
 * Fedora: post FPC ticket to move add %tmpfiles_create to the packaging guidelines

commit c961869ac580f5a3aea3737f9e45af71b0983662
Author: Michael Olbrich <m.olbrich at pengutronix.de>
Date:   Wed Jun 12 08:41:16 2013 +0200

    service: don't enter a second SIGTERM/SIGKILL cycle if no ExecStopPost= process is defined
    
    It won't help if the main process is still there and there is no new
    process to kill.

diff --git a/src/core/service.c b/src/core/service.c
index 2bc0dc5..b98f11a 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -1987,7 +1987,7 @@ static void service_enter_stop_post(Service *s, ServiceResult f) {
 
                 service_set_state(s, SERVICE_STOP_POST);
         } else
-                service_enter_signal(s, SERVICE_FINAL_SIGTERM, SERVICE_SUCCESS);
+                service_enter_dead(s, SERVICE_SUCCESS, true);
 
         return;