chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
service: make sure sysv services marked as interactive in the LSB header get output...
[elogind.git]
/
src
/
service.c
diff --git
a/src/service.c
b/src/service.c
index ff74a6d6689576d07ad5d6c045215b5d37adb3c1..80cd6ad9c65eddb43a2d4b15986d5588b52f4594 100644
(file)
--- 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->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;
s->exec_context.kill_mode = KILL_PROCESS_GROUP;
u->meta.load_state = UNIT_LOADED;