X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.xml;h=bf450d51c86e278e65cf8ed01864232eac82f1c6;hb=c66e7bc7a19c068ca1c414f2f8bd5dc13c20907f;hp=d66b23027a512dc65409f5b268442462fef519e3;hpb=346bce1f4cff0096177c613987cdc80fa4ec134e;p=elogind.git
diff --git a/man/systemd.xml b/man/systemd.xml
index d66b23027..bf450d51c 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
.
@@ -808,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
@@ -818,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
@@ -943,11 +957,21 @@
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.:systemd.unit=
+ rd.systemd.unit=Overrides the unit to
activate on boot. Defaults to
@@ -957,8 +981,12 @@
rescue.target or
emergency.service. See
systemd.special7
- for details about these
- units.
+ for details about these units. The
+ option prefixed with
+ rd. is honoured
+ only in the initial RAM disk (initrd),
+ while the one that isn't prefixed only
+ in the main system.
@@ -1013,7 +1041,11 @@
argument. If
shows terse service status updates on
the console during bootup. Defaults to
- .
+ , unless
+ is passed as
+ kernel command line option in which
+ case it defaults to
+ .
@@ -1054,7 +1086,114 @@
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.
+
+
+
+ quiet
+
+ If passed turns off
+ status output at boot, and disconnects
+ SysV scripts from the console, much
+ like
+ systemd.show_status=false
+ and
+ systemd.sysv_console=false
+ would. Note that this option is also
+ read by the kernel itself and disables
+ kernel log output to the
+ kernel. Passing this option hence
+ turns off the usual output from both
+ the system manager and the
+ kernel.
+
+
+
+ emergency
+
+ Boot into emergency
+ mode. This is equivalent to
+ systemd.unit=emergency.target
+ and provided for compatibility
+ reasons and to be easier to type.
+
+
+
+ single
+ s
+ S
+ 1
+
+ Boot into rescue
+ mode. This is equivalent to
+ systemd.unit=rescue.target
+ and provided for compatibility reasons
+ and to be easier to
+ type.
+
+
+
+ 2
+ 3
+ 4
+ 5
+
+ Boot into the
+ specified legacy SysV runlevel. This
+ is equivalent to
+ systemd.unit=runlevel2.target,
+ systemd.unit=runlevel3.target,
+ systemd.unit=runlevel4.target,
+ resp. systemd.unit=runlevel5.target
+ and provided for compatibility reasons
+ and to be easier to
+ type.
+
+
+
+ locale.LANG=
+ locale.LANGUAGE=
+ locale.LC_CTYPE=
+ locale.LC_NUMERIC=
+ locale.LC_TIME=
+ locale.LC_COLLATE=
+ locale.LC_MONETARY=
+ locale.LC_MESSAGES=
+ locale.LC_PAPER=
+ locale.LC_NAME=
+ locale.LC_ADDRESS=
+ locale.LC_TELEPHONE=
+ locale.LC_MEASUREMENT=
+ locale.LC_IDENTIFICATION=
+
+ Set the system locale
+ to use. This overrides the settings in
+ /etc/locale.conf. For
+ more information see
+ locale.conf5
+ and
+ locale7.
+
+
+
+ For other kernel command line parameters
+ understood by components of the core OS, please refer
+ to
+ kernel-command-line7.
@@ -1073,19 +1212,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
@@ -1134,7 +1260,8 @@
sd-daemon7,
systemd.unit5,
systemd.special5,
- pkg-config1
+ pkg-config1,
+ kernel-command-line7