X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.xml;h=47d6438939a12020142aa3db9ab86521f3f363ad;hp=7b3d265b8da926152814b5899d6746c93509f768;hb=0b429ab7fca2aa139ffbeeac8bdcfbbd21cc1a60;hpb=bb31a4ac1997c189a344caf554f34c6aabc71aa7
diff --git a/man/systemd.xml b/man/systemd.xml
index 7b3d265b8..47d643893 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -78,7 +78,7 @@
the configuration file
system.conf, otherwise
user.conf. See
- systemd.conf5
+ systemd-system.conf5
for more information.
@@ -285,25 +285,27 @@
Concepts
systemd provides a dependency system between
- various entities called "units". Units encapsulate
- various objects that are relevant for system boot-up
- and maintenance. The majority of units are configured
- in unit configuration files, whose syntax and basic
- set of options is described in
+ various entities called "units" of 12 different
+ types. Units encapsulate various objects that are
+ relevant for system boot-up and maintenance. The
+ majority of units are configured in unit configuration
+ files, whose syntax and basic set of options is
+ described in
systemd.unit5,
however some are created automatically from other
- configuration or dynamically from system state. Units
- may be 'active' (meaning started, bound, plugged in,
- ... depending on the unit type, see below), or
- 'inactive' (meaning stopped, unbound, unplugged, ...),
- as well as in the process of being activated or
- deactivated, i.e. between the two states (these states
- are called 'activating', 'deactivating'). A special
- 'failed' state is available as well which is very
- similar to 'inactive' and is entered when the service
- failed in some way (process returned error code on
- exit, or crashed, or an operation timed out). If this
- state is entered the cause will be logged, for later
+ configuration, dynamically from system state or
+ programmatically at runtime. Units may be "active"
+ (meaning started, bound, plugged in, ..., depending on
+ the unit type, see below), or "inactive" (meaning
+ stopped, unbound, unplugged, ...), as well as in the
+ process of being activated or deactivated,
+ i.e. between the two states (these states are called
+ "activating", "deactivating"). A special "failed"
+ state is available as well, which is very similar to
+ "inactive" and is entered when the service failed in
+ some way (process returned error code on exit, or
+ crashed, or an operation timed out). If this state is
+ entered, the cause will be logged, for later
reference. Note that the various unit types may have a
number of additional substates, which are mapped to
the five generalized unit states described
@@ -312,7 +314,7 @@
The following unit types are available:
- Service units, which control
+ Service units, which start and control
daemons and the processes they consist of. For
details see
systemd.service5.
@@ -369,6 +371,18 @@
objects change or are modified. See
systemd.path5.
+ Slice units may be used to
+ group units which manage system processes
+ (such as service and scope units) in a
+ hierarchical tree for resource management
+ purposes. See
+ systemd.slice5.
+
+ Scope units are similar to
+ service units, but manage foreign processes
+ instead of starting them as well. See
+ systemd.scope5.
+
Units are named as their configuration
@@ -425,7 +439,7 @@
individual Linux control groups named after the unit
which they belong to in the private systemd
hierarchy. (see cgroups.txt
+ url="https://www.kernel.org/doc/Documentation/cgroups/cgroups.txt">cgroups.txt
for more information about control groups, or short
"cgroups"). systemd uses this to effectively keep
track of processes. Control group information is
@@ -473,7 +487,7 @@
Systemd contains native implementations of
various tasks that need to be executed as part of the
- boot process. For example, it sets the host name or
+ boot process. For example, it sets the hostname or
configures the loopback network device. It also sets
up and mounts various API file systems, such as
/sys or
@@ -535,7 +549,9 @@
disable commands of
the
systemctl1
- tool.
+ tool. Full list of directories is provided in
+ systemd.unit5.
+
@@ -564,7 +580,9 @@
tool can handle both global (i.e. for
all users) and private (for one user)
enabling/disabling of
- units.
+ units. Full list of directories is provided in
+ systemd.unit5.
+
@@ -607,7 +625,7 @@
- SIGTERM
+ SIGTERM
Upon receiving this
signal the systemd system manager
@@ -627,7 +645,7 @@
- SIGINT
+ SIGINT
Upon receiving this
signal the systemd system manager will
@@ -639,11 +657,11 @@
systemd user managers
treat this signal the same way as
- SIGTERM.
+ SIGTERM.
- SIGWINCH
+ SIGWINCH
When this signal is
received the systemd system manager
@@ -659,7 +677,7 @@
- SIGPWR
+ SIGPWR
When this signal is
received the systemd manager
@@ -671,7 +689,7 @@
- SIGUSR1
+ SIGUSR1
When this signal is
received the systemd manager will try
@@ -680,7 +698,7 @@
- SIGUSR2
+ SIGUSR2
When this signal is
received the systemd manager will log
@@ -691,7 +709,7 @@
- SIGHUP
+ SIGHUP
Reloads the complete
daemon configuration. This is mostly
@@ -700,7 +718,7 @@
- SIGRTMIN+0
+ SIGRTMIN+0
Enters default mode, starts the
default.target
@@ -710,7 +728,7 @@
- SIGRTMIN+1
+ SIGRTMIN+1
Enters rescue mode,
starts the
@@ -721,7 +739,7 @@
- SIGRTMIN+2
+ SIGRTMIN+2
Enters emergency mode,
starts the
@@ -732,7 +750,7 @@
- SIGRTMIN+3
+ SIGRTMIN+3
Halts the machine,
starts the
@@ -743,7 +761,7 @@
- SIGRTMIN+4
+ SIGRTMIN+4
Powers off the machine,
starts the
@@ -754,7 +772,7 @@
- SIGRTMIN+5
+ SIGRTMIN+5
Reboots the machine,
starts the
@@ -765,7 +783,7 @@
- SIGRTMIN+6
+ SIGRTMIN+6
Reboots the machine via kexec,
starts the
@@ -776,31 +794,31 @@
- SIGRTMIN+13
+ SIGRTMIN+13
Immediately halts the machine.
- SIGRTMIN+14
+ SIGRTMIN+14
Immediately powers off the machine.
- SIGRTMIN+15
+ SIGRTMIN+15
Immediately reboots the machine.
- SIGRTMIN+16
+ SIGRTMIN+16
Immediately reboots the machine with kexec.
- SIGRTMIN+20
+ SIGRTMIN+20
Enables display of
status messages on the console, as
@@ -811,7 +829,7 @@
- SIGRTMIN+21
+ SIGRTMIN+21
Disables display of
status messages on the console, as
@@ -822,23 +840,23 @@
- SIGRTMIN+22
- SIGRTMIN+23
+ SIGRTMIN+22
+ SIGRTMIN+23
Sets the log level to
debug
(or info on
- SIGRTMIN+23), as
+ SIGRTMIN+23), as
controlled via
systemd.log_level=debug
(or systemd.log_level=info
- on SIGRTMIN+23) on
+ on SIGRTMIN+23) on
the kernel command
line.
- SIGRTMIN+24
+ SIGRTMIN+24
Immediately exits the
manager (only available for --user
@@ -846,28 +864,28 @@
- SIGRTMIN+26
- SIGRTMIN+27
- SIGRTMIN+28
- SIGRTMIN+29
+ SIGRTMIN+26
+ SIGRTMIN+27
+ SIGRTMIN+28
+ SIGRTMIN+29
Sets the log level to
journal-or-kmsg
(or console on
- SIGRTMIN+27,
+ SIGRTMIN+27,
kmsg on
- SIGRTMIN+28,
+ SIGRTMIN+28,
or syslog-or-kmsg
- on SIGRTMIN+29), as
+ on SIGRTMIN+29), as
controlled via
systemd.log_target=journal-or-kmsg
(or systemd.log_target=console
- on SIGRTMIN+27,
+ on SIGRTMIN+27,
systemd.log_target=kmsg
- on SIGRTMIN+28,
+ on SIGRTMIN+28,
or
systemd.log_target=syslog-or-kmsg
- on SIGRTMIN+29) on
+ on SIGRTMIN+29) on
the kernel command
line.
@@ -877,7 +895,7 @@
Environment
-
+
$SYSTEMD_LOG_LEVEL
systemd reads the
@@ -987,7 +1005,7 @@
/proc/cmdline
instead.:
-
+
systemd.unit=
rd.systemd.unit=
@@ -1004,7 +1022,7 @@
option prefixed with
rd. is honored
only in the initial RAM disk (initrd),
- while the one that isn't prefixed only
+ while the one that is not prefixed only
in the main system.
@@ -1040,7 +1058,7 @@
argument. If positive systemd
activates the specified virtual
terminal when it crashes. Defaults to
- -1.
+ -1.
@@ -1095,30 +1113,38 @@
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 it unsets
- an environment variable which might be
- passed in from the initial ram
- disk.
+ argument in the form VARIABLE=VALUE.
+ May be used to set default environment
+ variables to add to forked child processes.
+ May be used more than once to set multiple
+ variables.
quiet
- If passed turns off
+ Turn off
status output at boot, much like
systemd.show_status=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 log output. Passing this option
+ hence turns off the usual output from
+ both the system manager and the kernel.
+
+
+
+
+ debug
+
+ Turn on debugging
+ output. This is equivalent to
+ systemd.log_level=debug.
+ Note that this option is also read by
+ the kernel itself and enables kernel
+ debug output. Passing this option
+ hence turns on the debug output from
+ both the system manager and the
kernel.
@@ -1206,7 +1232,7 @@
Daemon status
notification socket. This is an
- AF_UNIX datagram socket and is used to
+ AF_UNIX datagram socket and is used to
implement the daemon notification
logic as implemented by
sd_notify3.
@@ -1219,7 +1245,7 @@
Used internally by the
shutdown8
tool to implement delayed
- shutdowns. This is an AF_UNIX datagram
+ shutdowns. This is an AF_UNIX datagram
socket.
@@ -1230,7 +1256,7 @@
communication channel between
systemctl1
and the systemd process. This is an
- AF_UNIX stream socket. This interface
+ AF_UNIX stream socket. This interface
is private to systemd and should not
be used in external
projects.
@@ -1254,7 +1280,7 @@
See Also
- systemd.conf5,
+ systemd-system.conf5,
locale.conf5,
systemctl1,
journalctl1,
@@ -1265,7 +1291,8 @@
systemd.special5,
pkg-config1,
kernel-command-line7,
- bootup7
+ bootup7,
+ systemd.directives7