From: David Ward <david.ward@ll.mit.edu>
Date: Tue, 3 Apr 2012 03:45:35 +0000 (-0400)
Subject: service: schedule JOB_RESTART from SERVICE_AUTO_RESTART state
X-Git-Tag: v183~462
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=48bb58769a00e8e50a617ebbfff84599a0350fa5

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 8b5c0b07c..bf2e0a9d9 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);