diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-02-15 12:27:29 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-02-15 12:28:01 +0100 |
| commit | 934da0359966a77ff4f1505a4663e34aa434f4d3 (patch) | |
| tree | 3fcc71d40c14c635152497b61aad910fe50b197e | |
| parent | 0a494f1ff323ef36b7acc637c198fdfa240c2bb2 (diff) | |
service: change default std output to inherit
| -rw-r--r-- | man/systemd.xml | 3 | ||||
| -rw-r--r-- | src/main.c | 2 | ||||
| -rw-r--r-- | src/manager.c | 2 | ||||
| -rw-r--r-- | src/system.conf | 2 |
4 files changed, 3 insertions, 6 deletions
diff --git a/man/systemd.xml b/man/systemd.xml index eff093a0f1..2c42a02918 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 8512e0b1d4..96a282a34f 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 a7c8885e80..7d0b351c9d 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 bd5a1a7894..4e06319b35 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 |