diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-02-15 11:52:29 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-02-15 11:52:29 +0100 |
| commit | 0a494f1ff323ef36b7acc637c198fdfa240c2bb2 (patch) | |
| tree | b266f13b03e348b017d62592aa38fd08daecddb3 /man | |
| parent | b7cf1b68a79833411851fa547ac9b4906207c224 (diff) | |
exec: introduce global defaults for the standard output of services
Diffstat (limited to 'man')
| -rw-r--r-- | man/systemd.conf.xml | 2 | ||||
| -rw-r--r-- | man/systemd.xml | 36 |
2 files changed, 38 insertions, 0 deletions
diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml index 54a8398d43..8faedda6c2 100644 --- a/man/systemd.conf.xml +++ b/man/systemd.conf.xml @@ -81,6 +81,8 @@ <term><varname>ShowStatus=yes</varname></term> <term><varname>SysVConsole=yes</varname></term> <term><varname>CrashChVT=1</varname></term> + <term><varname>DefaultStandardOutput=null</varname></term> + <term><varname>DefaultStandardError=inherit</varname></term> <listitem><para>Configures various parameters of basic manager diff --git a/man/systemd.xml b/man/systemd.xml index 88904b7a09..eff093a0f1 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -250,6 +250,30 @@ it defaults to <option>true</option>.</para></listitem> </varlistentry> + <varlistentry> + <term><option>--default-standard-output=</option></term> + <term><option>--default-standard-error=</option></term> + + <listitem><para>Sets the default + output resp. error output for all + services and sockets, i.e. controls + the default for + <option>StandardOutput=</option> + resp. <option>StandardExecute=</option> + (see + <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry> + for details). Takes one of + <option>inherit</option>, + <option>null</option>, + <option>tty</option>, + <option>syslog</option>, + <option>syslog+console</option>, + <option>kmsg</option>, + <option>kmsg-console</option>. If the + argument is omitted it defaults to + <option>null</option> + resp. <option>inherit</option>.</para></listitem> + </varlistentry> </variablelist> </refsect1> @@ -981,6 +1005,18 @@ environment variables described above.</para></listitem> </varlistentry> + <varlistentry> + <term><varname>systemd.default_standard_output=</varname></term> + <term><varname>systemd.default_standard_error=</varname></term> + <listitem><para>Controls default + standard output/error output for + services, with the same effect as the + <option>--default-standard-output=</option> + resp. <option>--default-standard-error=</option> + command line arguments described + above.</para></listitem> + </varlistentry> + </variablelist> </refsect1> |