X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.xml;h=d179273caa2c1f2575f4c695f069156c8d7a5025;hp=142c1d6a055ae965d3d1779f14cbad0b11ff6daf;hb=d03bc1b814b853497120c35a9a8d6a66925963ff;hpb=d636fa3d67a76e512c5a3b2028e2c62ec5bbc50c
diff --git a/man/systemd.xml b/man/systemd.xml
index 142c1d6a0..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
,
+ ,
,
,
+ ,
,
.
@@ -259,18 +261,25 @@
services and sockets, i.e. controls
the default for
- resp.
+ resp.
(see
systemd.exec5
for details). Takes one of
,
,
,
+ ,
+ ,
,
,
,
. If the
- argument is omitted it defaults to
+ argument is omitted
+
+ defaults to
+ and
+
+ to
.
@@ -800,6 +809,49 @@
on the kernel command
line.
+
+
+ SIGRTMIN+22
+ SIGRTMIN+23
+
+ Sets the log level to
+ debug
+ (resp. info on
+ SIGRTMIN+23), as
+ controlled via
+ systemd.log_level=debug
+ (resp. systemd.log_level=info
+ on SIGRTMIN+23) on
+ the kernel command
+ line.
+
+
+
+ SIGRTMIN+26
+ SIGRTMIN+27
+ SIGRTMIN+28
+ SIGRTMIN+29
+
+ Sets the log level to
+ 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=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
+ on SIGRTMIN+29) on
+ the kernel command
+ line.
+
@@ -905,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.:
@@ -1016,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.
+
+
@@ -1035,19 +1112,6 @@
-
- /run/systemd/logger
-
- Used internally by the
- systemd-logger.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