diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-04-26 15:52:55 +0200 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-04-26 15:52:55 +0200 |
commit | a109d2e204ae9561c4a7f7982448a6ca0d318fb3 (patch) | |
tree | e5748844e740c3e7452040154fd3035b304eaee8 /man | |
parent | Revert "smaller journal fixes (#3124)" (diff) | |
parent | man: elaborate on the automatic systemd-journald.socket service dependencies (diff) | |
download | systemd-a109d2e204ae9561c4a7f7982448a6ca0d318fb3.tar.xz systemd-a109d2e204ae9561c4a7f7982448a6ca0d318fb3.zip |
Merge pull request #3124 from poettering/small-journal-fixes
Diffstat (limited to 'man')
-rw-r--r-- | man/systemd.exec.xml | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index 4ed62dbada..fea42ebd31 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -94,11 +94,10 @@ required to access <filename>/tmp</filename> and <filename>/var/tmp</filename>.</para> - <para>Units whose output standard output or error output is - connected to any other sink but <option>null</option>, - <option>tty</option> and <option>socket</option> automatically - acquire dependencies of type <varname>After=</varname> on - <filename>journald.socket</filename>.</para> + <para>Units whose output standard output or error output is connected to <option>journal</option>, + <option>syslog</option> or <option>kmsg</option> (or their combinations with console output, see below) + automatically acquire dependencies of type <varname>After=</varname> on + <filename>systemd-journald.socket</filename>.</para> </refsect1> <refsect1> @@ -470,6 +469,10 @@ similar to the same option of <varname>StandardInput=</varname>.</para> + <para>If the standard output (or error output, see below) of a unit is connected with the journal, syslog or + the kernel log buffer the unit will implicitly gain a dependency of type <varname>After=</varname> on + <filename>systemd-journald.socket</filename> (also see the automatic dependencies section above).</para> + <para>This setting defaults to the value set with <option>DefaultStandardOutput=</option> in <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>, |