X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.special.xml;h=863a029fe3bd74213de0eec931353e2164360092;hp=172836ee20e6ffc6be8216a3e476208afcccc15f;hb=6b46ea73e3b1d8a1e65f58ac04772821bd4a72fb;hpb=1183f9b2252d0ee45ec7ad32ba34be746ceaaf6e
diff --git a/man/systemd.special.xml b/man/systemd.special.xml
index 172836ee2..863a029fe 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -71,6 +71,7 @@
local-fs-pre.target,
multi-user.target,
network.target,
+ network-online.target,
nss-lookup.target,
nss-user-lookup.target,
paths.target,
@@ -79,7 +80,6 @@
reboot.target,
remote-fs.target,
remote-fs-pre.target,
- remote-fs-setup.target,
rescue.target,
initrd-root-fs.target,
rpcbind.target,
@@ -100,7 +100,11 @@
system-update.target,
time-sync.target,
timers.target,
- umount.target
+ umount.target,
+ -.slice,
+ system.slice,
+ user.slice,
+ machine.slice
@@ -314,7 +318,7 @@
dependencies of type
Before= to
sysroot-usr.mount
- and all mount points fround in
+ and all mount points found in
/etc/fstab
that have the
and
@@ -381,12 +385,73 @@
this unit during
installation. This is best
configured via
- WantedBy=multi-uer.target
+ WantedBy=multi-user.target
in the unit's
[Install]
section.
+
+ network-online.target
+
+ Units that strictly
+ require a configured network
+ connection should pull in
+ network-online.target
+ (via a
+ Wants= type
+ dependency) and order
+ themselves after it. This
+ target unit is intended to
+ pull in a service that delays
+ further execution until the
+ network is sufficiently set
+ up. What precisely this
+ requires is left to the
+ implementation of the network
+ managing service.
+
+ Note the distinction
+ between this unit and
+ network.target. This
+ unit is an active unit
+ (i.e. pulled in by the
+ consumer rather than the
+ provider of this
+ functionality) and pulls in a
+ service which possibly adds
+ substantial delays to further
+ execution. In contrast,
+ network.target
+ is a passive unit (i.e. pulled
+ in by the provider of the
+ functionality, rather than the
+ consumer) that usually does
+ not delay execution
+ much. Usually,
+ network.target
+ is part of the boot of most
+ systems, while
+ network-online.target
+ is not, except when at least
+ one unit requires it. Also see
+ Running
+ Services After the Network is
+ up for more
+ information.
+
+ All mount units for
+ remote network file systems
+ automatically pull in this
+ unit, and order themselves
+ after it. Note that networking
+ daemons that simply provide
+ functionality to other hosts
+ generally do not need to pull
+ this in.
+
+ paths.target
@@ -458,29 +523,6 @@
facility.
-
- remote-fs-setup.target
-
- This target unit is
- automatically pulled in (by a
- Wants= type
- dependency) by all remote
- mount points. It can be used
- to run certain units when at
- least one remote file system
- is to be mounted. Note that
- this target is not ordered
- against the remote mounts, use
- remote-fs-pre.target
- for that (see below).
-
- Again, this target unit
- is not
- suitable for ordering, it is
- only useful for pulling in
- other units.
-
- rescue.target
@@ -746,7 +788,7 @@
available at boot.
This may be used to pull
- in printer management
+ in smartcard management
daemons dynamically when
smartcard hardware is
found.
@@ -763,7 +805,7 @@
This may be used to pull
in audio management daemons
- dynamically when printer
+ dynamically when audio
hardware is found.
@@ -812,6 +854,26 @@
network.target
+ This unit is supposed to
+ indicate when network
+ functionality is available,
+ but it is only very weakly
+ defined what that is supposed
+ to mean, with one exception:
+ at shutdown, a unit that is
+ ordered after
+ network.target
+ will be stopped before the
+ network -- to whatever level
+ it might be set up then -- is
+ shut down. Also see Running
+ Services After the Network is
+ up for more
+ information. Also see
+ network-online.target
+ described above.
+
systemd automatically
adds dependencies of type
After= for
@@ -821,15 +883,6 @@
$network
facility.
- This unit is supposed to
- indicate when the network is
- "up", but it is only very
- loosely defined what that is
- supposed to mean. Also see Running
- Services After the Network is
- up for more
- information.
@@ -886,9 +939,9 @@
Wants= type
dependency. If the unit wants
to be pulled in by the first
- remote mount showing up it
+ remote mount showing up, it
should use
- remote-fs-setup.target
+ network-online.target
(see above).
Again, this target unit
@@ -958,8 +1011,8 @@
terminate the user service
manager should start this
unit. If systemd receives
- SIGTERM or SIGINT when running
- as user service daemon it will
+ SIGTERM or SIGINT when running
+ as user service daemon, it will
start this unit.Normally, this pulls in
@@ -973,6 +1026,63 @@
+
+ Special Slice Units
+
+ There are four .slice units
+ which form the basis of the hierarchy for assignment
+ of resources for services, users, and virtual machines
+ or containers.
+
+
+
+ -.slice
+
+ The root slice is the
+ root of the hierarchy. It
+ usually does not contain units
+ directly, but may be used to
+ set defaults for the whole
+ tree.
+
+
+
+
+ system.slice
+
+ By default, all services
+ services started by
+ systemd are
+ found in this slice.
+
+
+
+
+ user.slice
+
+ By default, all user
+ processes and services started
+ on behalf of the user,
+ including the per-user systemd
+ instance are found in this
+ slice.
+
+
+
+
+ machine.slice
+
+ By defalt, all virtual
+ machines and containers
+ registered with
+ systemd-machined
+ are found in this slice.
+
+
+
+
+
+
See Also
@@ -981,6 +1091,7 @@
systemd.service5,
systemd.socket5,
systemd.target5,
+ systemd.slice5,
bootup7,
systemd-fstab-generator8