chiark / gitweb /
execute: send output of services by default to same place as systemd internal output
authorLennart Poettering <lennart@poettering.net>
Wed, 19 May 2010 19:51:25 +0000 (21:51 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 19 May 2010 19:51:25 +0000 (21:51 +0200)
src/execute.c

index 51e7688..f3cf026 100644 (file)
@@ -1078,8 +1078,9 @@ void exec_context_init(ExecContext *c) {
         c->mount_flags = MS_SHARED;
 
         c->std_input = EXEC_INPUT_NULL;
-        c->std_output = EXEC_OUTPUT_SYSLOG;
-        c->std_error = EXEC_OUTPUT_SYSLOG;
+        c->std_output = c->std_error =
+                (log_get_target() == LOG_TARGET_CONSOLE ? EXEC_OUTPUT_INHERIT :
+                 log_get_target() == LOG_TARGET_KMSG ? EXEC_OUTPUT_KMSG : EXEC_OUTPUT_SYSLOG);
 }
 
 void exec_context_done(ExecContext *c) {