From 934da0359966a77ff4f1505a4663e34aa434f4d3 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 15 Feb 2011 12:27:29 +0100 Subject: service: change default std output to inherit --- man/systemd.xml | 3 +-- src/main.c | 2 +- src/manager.c | 2 -- 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 @@ , . If the argument is omitted it defaults to - - resp. . + . 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 -- cgit v1.2.3-54-g00ecf