From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 19 May 2010 19:51:25 +0000 (+0200)
Subject: execute: send output of services by default to same place as systemd internal output
X-Git-Tag: v1~314
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=8783d2feaeb74fa37494b84024521a6e8a9b9276;ds=sidebyside

execute: send output of services by default to same place as systemd internal output
---

diff --git a/src/execute.c b/src/execute.c
index 51e768893..f3cf02615 100644
--- a/src/execute.c
+++ b/src/execute.c
@@ -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) {