service: change default std output to inherit

diff --git a/man/systemd.xml b/man/systemd.xml
index eff093a0f14ac99aebb10425db401cf06b151b2c..2c42a02918ae649fafa85a2a86c6b9d91161212a 100644 (file)
--- 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 8512e0b1d4e1ed1a5604f9135f8f8f437dbc1b35..96a282a34fe7c35281dd3f2e5f5aca8ae9b51722 100644 (file)
--- 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 a7c8885e80fb10a117e4c647ab00b8d0296cc93e..7d0b351c9d14de68c978e486bcea151cbf6498cd 100644 (file)
--- 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 bd5a1a789475e21b5c0956879fe87b2c56756b6e..4e06319b35e9637a2b66093d7317addf7db60ba9 100644 (file)
--- a/src/system.conf
+++ b/src/system.conf
@@ -21,5 +21,5 @@
 #MountAuto=yes
 #SwapAuto=yes
 #DefaultControllers=cpu
-#DefaultStandardOutput=null
+#DefaultStandardOutput=inherit
 #DefaultStandardError=inherit