main: fix auto restarting of units after a configuration reload

diff --git a/fixme b/fixme
index 373d100fa66da69c42c78b699fd08c747d4a03e5..186d3c704ac2d072d691e61e5d0fe36666994bbb 100644 (file)
--- a/fixme
+++ b/fixme
@@ -82,8 +82,6 @@
 
 * don't show file not found msgs for irrelevant units
 
-* getty doesn't respawn
-
 External:
 
 * sysv functions should color when stdout is tty, not stdin

diff --git a/src/service.c b/src/service.c
index d6086ca410488a85661e67b1450f3ad1deae01c5..318d8a7dc4e558e2a43dcb68eb744994bac08ede 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -1500,7 +1500,7 @@ static void service_enter_dead(Service *s, bool success, bool allow_restart) {
                 s->failure = true;
 
         if (allow_restart &&
-            s->allow_restart &&
+            !s->forbid_restart &&
             (s->restart == SERVICE_RESTART_ALWAYS ||
              (s->restart == SERVICE_RESTART_ON_SUCCESS && !s->failure))) {
 
@@ -1511,6 +1511,8 @@ static void service_enter_dead(Service *s, bool success, bool allow_restart) {
         } else
                 service_set_state(s, s->failure ? SERVICE_MAINTENANCE : SERVICE_DEAD);
 
+        s->forbid_restart = false;
+
         return;
 
 fail:
@@ -1932,7 +1934,7 @@ static int service_start(Unit *u) {
 
         s->failure = false;
         s->main_pid_known = false;
-        s->allow_restart = true;
+        s->forbid_restart = false;
 
         service_enter_start_pre(s);
         return 0;
@@ -1945,7 +1947,7 @@ static int service_stop(Unit *u) {
 
         /* This is a user request, so don't do restarts on this
          * shutdown. */
-        s->allow_restart = false;
+        s->forbid_restart = true;
 
         /* Already on it */
         if (s->state == SERVICE_STOP ||

diff --git a/src/service.h b/src/service.h
index 3e18d221d7d0d3122208d7088b6a0dc531dd278a..725e2135f156cbd02a78ff497e03bce8496f2afb 100644 (file)
--- a/src/service.h
+++ b/src/service.h
@@ -115,7 +115,7 @@ struct Service {
         bool failure:1;
         bool main_pid_known:1;
         bool bus_name_good:1;
-        bool allow_restart:1;
+        bool forbid_restart:1;
         bool got_socket_fd:1;
         bool sysv_has_lsb:1;
         bool sysv_enabled:1;