X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.xml;h=32bca0b607bd00f34e6a6ad8221d7016d1ebd43c;hp=497dd2bfeeb635a78ab8f835fff303ce7922bab4;hb=7abfbe7903d8e792850ec39286a3d86e616a6477;hpb=9749cd77bc6121a304a7f1eb0f03f26e620dc9da
diff --git a/man/systemd.xml b/man/systemd.xml
index 497dd2bfe..32bca0b60 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -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
+ hierachial 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
@@ -611,7 +625,7 @@
- SIGTERM
+ SIGTERM
Upon receiving this
signal the systemd system manager
@@ -631,7 +645,7 @@
- SIGINT
+ SIGINT
Upon receiving this
signal the systemd system manager will
@@ -643,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
@@ -663,7 +677,7 @@
- SIGPWR
+ SIGPWR
When this signal is
received the systemd manager
@@ -675,7 +689,7 @@
- SIGUSR1
+ SIGUSR1
When this signal is
received the systemd manager will try
@@ -684,7 +698,7 @@
- SIGUSR2
+ SIGUSR2
When this signal is
received the systemd manager will log
@@ -695,7 +709,7 @@
- SIGHUP
+ SIGHUP
Reloads the complete
daemon configuration. This is mostly
@@ -704,7 +718,7 @@
- SIGRTMIN+0
+ SIGRTMIN+0
Enters default mode, starts the
default.target
@@ -714,7 +728,7 @@
- SIGRTMIN+1
+ SIGRTMIN+1
Enters rescue mode,
starts the
@@ -725,7 +739,7 @@
- SIGRTMIN+2
+ SIGRTMIN+2
Enters emergency mode,
starts the
@@ -736,7 +750,7 @@
- SIGRTMIN+3
+ SIGRTMIN+3
Halts the machine,
starts the
@@ -747,7 +761,7 @@
- SIGRTMIN+4
+ SIGRTMIN+4
Powers off the machine,
starts the
@@ -758,7 +772,7 @@
- SIGRTMIN+5
+ SIGRTMIN+5
Reboots the machine,
starts the
@@ -769,7 +783,7 @@
- SIGRTMIN+6
+ SIGRTMIN+6
Reboots the machine via kexec,
starts the
@@ -780,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
@@ -815,7 +829,7 @@
- SIGRTMIN+21
+ SIGRTMIN+21
Disables display of
status messages on the console, as
@@ -826,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
@@ -850,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.
@@ -1044,7 +1058,7 @@
argument. If positive systemd
activates the specified virtual
terminal when it crashes. Defaults to
- -1.
+ -1.
@@ -1099,16 +1113,11 @@
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.
@@ -1223,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.
@@ -1236,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.
@@ -1247,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.