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

This commit is contained in:
Lennart Poettering 2010-08-19 02:42:07 +02:00
parent 71e4012737
commit 8a2b3c097b
2 changed files with 3 additions and 3 deletions

2
fixme
View File

@ -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:

View File

@ -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;