From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 19 Aug 2010 00:42:07 +0000 (+0200)
Subject: service: make sure sysv services marked as interactive in the LSB header get output... 
X-Git-Tag: v8~32
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a2b3c097b5ebd53348700f591e50530a82b5cea;p=systemd

service: make sure sysv services marked as interactive in the LSB header get output on the TTY in all cases
---

diff --git a/fixme b/fixme
index df80d8a9..a8a0dadc 100644
--- a/fixme
+++ b/fixme
@@ -64,8 +64,6 @@
 
 * systemctl: ln -s output muss abschaltbar sein, und warning wenn [Install] leer ist.
 
-* X-Interactive is kaputt
-
 * bash completion a la gdbus
 
 External:
diff --git a/src/service.c b/src/service.c
index ff74a6d6..80cd6ad9 100644
--- a/src/service.c
+++ b/src/service.c
@@ -708,7 +708,9 @@ static int service_load_sysv_path(Service *s, const char *path) {
         s->type = SERVICE_FORKING;
         s->remain_after_exit = true;
         s->restart = SERVICE_ONCE;
-        s->exec_context.std_output = s->meta.manager->sysv_console ? EXEC_OUTPUT_TTY : EXEC_OUTPUT_NULL;
+        s->exec_context.std_output =
+                (s->meta.manager->sysv_console || s->exec_context.std_input == EXEC_INPUT_TTY)
+                ? EXEC_OUTPUT_TTY : EXEC_OUTPUT_NULL;
         s->exec_context.kill_mode = KILL_PROCESS_GROUP;
 
         u->meta.load_state = UNIT_LOADED;