chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
units: In MeeGo there was more than one ExecStart lines present that caused systemd...
[elogind.git]
/
man
/
systemd.xml
diff --git
a/man/systemd.xml
b/man/systemd.xml
index 5129fbb050139865baf74d31a64e0d6f2fd5adac..a8a6967446c1e3d345dad1bc2fd418cdfc36b7d6 100644
(file)
--- a/
man/systemd.xml
+++ b/
man/systemd.xml
@@
-259,7
+259,7
@@
services and sockets, i.e. controls
the default for
<option>StandardOutput=</option>
services and sockets, i.e. controls
the default for
<option>StandardOutput=</option>
- resp. <option>StandardE
xecute
=</option>
+ resp. <option>StandardE
rror
=</option>
(see
<citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>
for details). Takes one of
(see
<citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>
for details). Takes one of
@@
-270,7
+270,12
@@
<option>syslog+console</option>,
<option>kmsg</option>,
<option>kmsg+console</option>. If the
<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>
<option>inherit</option>.</para></listitem>
</varlistentry>
</variablelist>
@@
-826,7
+831,7
@@
<literal>console</literal>
(resp. <literal>kmsg</literal> on
<literal>SIGRTMIN+28</literal>;
<literal>console</literal>
(resp. <literal>kmsg</literal> on
<literal>SIGRTMIN+28</literal>;
- resp.<literal>syslog-or-kmsg</literal>
+ resp.
<literal>syslog-or-kmsg</literal>
on <literal>SIGRTMIN+29</literal>), as
controlled via
<varname>systemd.log_target=console</varname>
on <literal>SIGRTMIN+29</literal>), as
controlled via
<varname>systemd.log_target=console</varname>
@@
-1074,10
+1079,10
@@
</varlistentry>
<varlistentry>
</varlistentry>
<varlistentry>
- <term><filename>/run/systemd/
logger
</filename></term>
+ <term><filename>/run/systemd/
stdout-syslog-bridge
</filename></term>
<listitem><para>Used internally by the
<listitem><para>Used internally by the
- <filename>systemd-
logger
.service</filename>
+ <filename>systemd-
stdout-syslog-bridge
.service</filename>
unit to connect STDOUT and/or STDERR
of spawned processes to
<citerefentry><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry>
unit to connect STDOUT and/or STDERR
of spawned processes to
<citerefentry><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry>