X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.xml;h=d179273caa2c1f2575f4c695f069156c8d7a5025;hb=d4d046e3fdf198be0d329ea79b30f56ae6bbb4d7;hp=a8a6967446c1e3d345dad1bc2fd418cdfc36b7d6;hpb=96804f05b99e11cd44a1b53090e850290bc32bdb;p=elogind.git
diff --git a/man/systemd.xml b/man/systemd.xml
index a8a696744..d179273ca 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -8,16 +8,16 @@
Copyright 2010 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see .
-->
@@ -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
@@ -813,7 +817,7 @@
Sets the log level to
debug
(resp. info on
- SIGRTMIN+32), as
+ SIGRTMIN+23), as
controlled via
systemd.log_level=debug
(resp. systemd.log_level=info
@@ -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