X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.xml;h=aef65e30c1105f7af857f802426188d5dcafc1ca;hb=6070fe66ac2f317e7e85e5685f0916d1e2b73a28;hp=c1766e26a46edc4ef94df9f7a02dae1733f5698a;hpb=75c982a79f68a9209f0bcaf422d50414167bc5d1;p=elogind.git
diff --git a/man/systemd.xml b/man/systemd.xml
index c1766e26a..aef65e30c 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -209,8 +209,10 @@
Set log
target. Argument must be one of
,
+ ,
,
,
+ ,
,
.
@@ -266,13 +268,15 @@
,
,
,
+ ,
+ ,
,
,
,
. If the
argument is omitted
- defaults to
+ defaults to
and
to
@@ -823,19 +827,24 @@
+ SIGRTMIN+26SIGRTMIN+27SIGRTMIN+28SIGRTMIN+29Sets the log level to
- console
- (resp. kmsg on
+ journal-or-kmsg
+ (resp. console on
+ SIGRTMIN+27;
+ resp. kmsg on
SIGRTMIN+28;
resp. syslog-or-kmsg
on SIGRTMIN+29), as
controlled via
- systemd.log_target=console
- (resp. systemd.log_target=kmsg
+ systemd.log_target=journal-or-kmsg
+ (resp. systemd.log_target=console
+ on SIGRTMIN+27;
+ resp. systemd.log_target=kmsg
on SIGRTMIN+28;
resp
systemd.log_target=syslog-or-kmsg
@@ -948,7 +957,16 @@
Kernel Command Line
- When run as system instance systemd parses a few kernel command line arguments:
+ When run as system instance systemd parses a
+ number of kernel command line
+ argumentsIf run inside a Linux
+ container these arguments may be passed as command
+ line arguments to systemd itself, next to any of the
+ command line options listed in the Options section
+ above. If run outside of Linux containers, these
+ arguments are parsed from
+ /proc/cmdline
+ instead.:
@@ -1059,6 +1077,22 @@
above.
+
+ systemd.setenv=
+
+ Takes a string
+ argument in the form
+ VARIABLE=VALUE. May be used to set
+ environment variables for the init
+ process and all its children at boot
+ time. May be used more than once to
+ set multiple variables. If the equal
+ sign and variable are missing unsets
+ an environment variable which might be
+ passed in from the initial ram
+ disk.
+
+
@@ -1078,19 +1112,6 @@
-
- /run/systemd/stdout-syslog-bridge
-
- Used internally by the
- systemd-stdout-syslog-bridge.service
- unit to connect STDOUT and/or STDERR
- of spawned processes to
- syslog3
- or the kernel log buffer. This is an
- AF_UNIX stream
- socket.
-
-
/run/systemd/shutdownd