diff options
| -rw-r--r-- | TODO | 5 | ||||
| -rw-r--r-- | man/systemd.exec.xml | 15 | ||||
| -rw-r--r-- | man/systemd.xml | 7 | ||||
| -rw-r--r-- | src/main.c | 2 | ||||
| -rw-r--r-- | src/system.conf | 2 |
5 files changed, 21 insertions, 10 deletions
@@ -23,7 +23,7 @@ Features: * service restart retry configuration -* tmpfiles: apply "x" on "D" too (see patch from William Douglas +* tmpfiles: apply "x" on "D" too (see patch from William Douglas) * tmpfiles: support generation of char/block devices, symlinks and one-line files (think sysfs) * Introduce ControlGroupPersistant=yes to set +t on the tasks file when creating the cgroup @@ -39,9 +39,6 @@ Features: * allow Type=simple with PIDFile= https://bugzilla.redhat.com/show_bug.cgi?id=723942 -* file bugs against sysklogd, syslog-ng because of StandardOuput=null -* turn default stdout/stderr to syslog (after rsyslog got updated) - * move PAM code into its own binary * warn if the user stops a service but not its associated socket diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index c7da8e312e..609484b3a3 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -396,8 +396,13 @@ socket activation, semantics are similar to the respective option of <varname>StandardInput=</varname>. - This setting defaults to - <option>inherit</option>.</para></listitem> + This setting defaults to the value set + with + <option>DefaultStandardOutput=</option> + in + <citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>, + which defaults to + <option>syslog</option>.</para></listitem> </varlistentry> <varlistentry> <term><varname>StandardError=</varname></term> @@ -411,7 +416,11 @@ <option>inherit</option> the file descriptor used for standard output is duplicated for standard error. This - setting defaults to + setting defaults to the value set with + <option>DefaultStandardError=</option> + in + <citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>, + which defaults to <option>inherit</option>.</para></listitem> </varlistentry> <varlistentry> diff --git a/man/systemd.xml b/man/systemd.xml index d66b23027a..a11c96e7f1 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -270,7 +270,12 @@ <option>syslog+console</option>, <option>kmsg</option>, <option>kmsg+console</option>. If the - argument is omitted it defaults to + argument is omitted + <option>--default-standard-output=</option> + defaults to <option>syslog</option> + and + <option>--default-standard-error=</option> + to <option>inherit</option>.</para></listitem> </varlistentry> </variablelist> diff --git a/src/main.c b/src/main.c index 94401a5c04..7af060aa40 100644 --- a/src/main.c +++ b/src/main.c @@ -76,7 +76,7 @@ static bool arg_mount_auto = true; static bool arg_swap_auto = true; static char **arg_default_controllers = NULL; static char ***arg_join_controllers = NULL; -static ExecOutput arg_default_std_output = EXEC_OUTPUT_INHERIT; +static ExecOutput arg_default_std_output = EXEC_OUTPUT_SYSLOG; static ExecOutput arg_default_std_error = EXEC_OUTPUT_INHERIT; static FILE* serialization = NULL; diff --git a/src/system.conf b/src/system.conf index ad2cd7f3b4..4e050579d5 100644 --- a/src/system.conf +++ b/src/system.conf @@ -21,6 +21,6 @@ #MountAuto=yes #SwapAuto=yes #DefaultControllers=cpu -#DefaultStandardOutput=inherit +#DefaultStandardOutput=syslog #DefaultStandardError=inherit #JoinControllers=cpu,cpuacct |