[systemd-commits] 2 commits - TODO src/service.c

[Lennart Poettering]

 TODO          |    2 ++
 src/service.c |    9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 08f23fd29c9df9c8b4e874933eb39711f069754b
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Apr 3 14:25:51 2012 +0200

    update TODO

diff --git a/TODO b/TODO
index c7bbd6d..9bff840 100644
--- a/TODO
+++ b/TODO
@@ -16,6 +16,8 @@ Bugfixes:
 
 Features:
 
+* allow configuration of console width/height in vconsole.conf
+
 * PrivateTmp should apply to both /tmp and /var/tmp
 
 * fstab should take priority over units in /usr

commit 48bb58769a00e8e50a617ebbfff84599a0350fa5
Author: David Ward <david.ward at ll.mit.edu>
Date:   Mon Apr 2 23:45:35 2012 -0400

    service: schedule JOB_RESTART from SERVICE_AUTO_RESTART state
    
    Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=45511

diff --git a/src/service.c b/src/service.c
index 8b5c0b0..bf2e0a9 100644
--- a/src/service.c
+++ b/src/service.c
@@ -2208,9 +2208,12 @@ static void service_enter_restart(Service *s) {
                         goto fail;
         }
 
-        service_enter_dead(s, SERVICE_SUCCESS, false);
-
-        if ((r = manager_add_job(UNIT(s)->manager, JOB_START, UNIT(s), JOB_FAIL, false, &error, NULL)) < 0)
+        /* Any units that are bound to this service must also be
+         * restarted. We use JOB_RESTART (instead of the more obvious
+         * JOB_START) here so that those dependency jobs will be added
+         * as well. */
+        r = manager_add_job(UNIT(s)->manager, JOB_RESTART, UNIT(s), JOB_FAIL, false, &error, NULL);
+        if (r < 0)
                 goto fail;
 
         log_debug("%s scheduled restart job.", UNIT(s)->id);