X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fservice.c;h=318d8a7dc4e558e2a43dcb68eb744994bac08ede;hb=47342320a097523d93040cdd627e237a420572c5;hp=f081705604180cd01d56058a17b630ef23262bb1;hpb=5de6b302196f3a708a0ed36d88abd9e17bbc9d52;p=elogind.git

diff --git a/src/service.c b/src/service.c
index f08170560..318d8a7dc 100644
--- a/src/service.c
+++ b/src/service.c
@@ -708,7 +708,7 @@ static int service_load_sysv_path(Service *s, const char *path) {
         s->type = SERVICE_FORKING;
         s->valid_no_process = true;
         s->restart = SERVICE_ONCE;
-        s->exec_context.std_output = EXEC_OUTPUT_TTY;
+        s->exec_context.std_output = s->meta.manager->sysv_console ? EXEC_OUTPUT_TTY : EXEC_OUTPUT_NULL;
         s->exec_context.kill_mode = KILL_PROCESS_GROUP;
 
         u->meta.load_state = UNIT_LOADED;
@@ -873,7 +873,7 @@ static int service_add_default_dependencies(Service *s) {
         }
 
         /* Second, activate normal shutdown */
-        return unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true);
+        return unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICTED_BY, SPECIAL_SHUTDOWN_TARGET, NULL, true);
 }
 
 static int service_load(Unit *u) {
@@ -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 ||