From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 15 Feb 2011 11:27:29 +0000 (+0100)
Subject: service: change default std output to inherit
X-Git-Tag: v18~11
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=934da0359966a77ff4f1505a4663e34aa434f4d3;hp=0a494f1ff323ef36b7acc637c198fdfa240c2bb2;p=elogind.git

service: change default std output to inherit
---

diff --git a/man/systemd.xml b/man/systemd.xml
index eff093a0f..2c42a0291 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -271,8 +271,7 @@
                                 <option>kmsg</option>,
                                 <option>kmsg-console</option>.  If the
                                 argument is omitted it defaults to
-                                <option>null</option>
-                                resp. <option>inherit</option>.</para></listitem>
+                                <option>inherit</option>.</para></listitem>
                         </varlistentry>
                 </variablelist>
         </refsect1>
diff --git a/src/main.c b/src/main.c
index 8512e0b1d..96a282a34 100644
--- a/src/main.c
+++ b/src/main.c
@@ -73,7 +73,7 @@ static bool arg_sysv_console = true;
 static bool arg_mount_auto = true;
 static bool arg_swap_auto = true;
 static char **arg_default_controllers = NULL;
-static ExecOutput arg_default_std_output = EXEC_OUTPUT_NULL;
+static ExecOutput arg_default_std_output = EXEC_OUTPUT_INHERIT;
 static ExecOutput arg_default_std_error = EXEC_OUTPUT_INHERIT;
 
 static FILE* serialization = NULL;
diff --git a/src/manager.c b/src/manager.c
index a7c8885e8..7d0b351c9 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -214,8 +214,6 @@ int manager_new(ManagerRunningAs running_as, Manager **_m) {
         m->exit_code = _MANAGER_EXIT_CODE_INVALID;
         m->pin_cgroupfs_fd = -1;
 
-        m->default_std_output = EXEC_OUTPUT_NULL;
-
 #ifdef HAVE_AUDIT
         m->audit_fd = -1;
 #endif
diff --git a/src/system.conf b/src/system.conf
index bd5a1a789..4e06319b3 100644
--- a/src/system.conf
+++ b/src/system.conf
@@ -21,5 +21,5 @@
 #MountAuto=yes
 #SwapAuto=yes
 #DefaultControllers=cpu
-#DefaultStandardOutput=null
+#DefaultStandardOutput=inherit
 #DefaultStandardError=inherit