X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.swap.xml;h=954e94412f4a21dd4792f5f8ce99fc6bc0dec987;hp=45f8f40ae1caf78084bfa4e81cafc634f7dd574d;hb=4160ec67ba40eee5d14c5b96d37c89a3a5356f34;hpb=ba035df230e41bf9d70ebb47915c9472b7884412
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
index 45f8f40ae..954e94412 100644
--- a/man/systemd.swap.xml
+++ b/man/systemd.swap.xml
@@ -68,13 +68,23 @@
specific configuration options are configured in the
[Swap] section.
- Swap units must be named after the devices they
- control. Example: the swap device
+ Swap units must be named after the devices
+ (resp. files) they control. Example: the swap device
/dev/sda5 must be configured in a
unit file dev-sda5.swap. For
details about the escaping logic used to convert a
file system path to a unit name see
systemd.unit5.
+
+ All swap units automatically get the appropriate
+ dependencies on the devices (resp. on the mount points
+ of the files) they are actived from.
+
+ Swap units with
+ DefaultDependencies= enabled
+ implicitly acquire a conflicting dependency to
+ umount.target so that they are
+ deactivated at shutdown.
@@ -88,6 +98,13 @@
If a swap device or file is configured in both
/etc/fstab and a unit file the
configuration in the latter takes precedence.
+
+ Unless the option is set
+ for them all swap units configured in
+ /etc/fstab are also added as
+ requirements to swap.target, so
+ that they are waited for and activated during
+ boot.
@@ -149,7 +166,7 @@
a time span value such as "5min
20s". Pass 0 to disable the timeout
logic. Defaults to
- 60s.
+ 90s.
@@ -158,7 +175,6 @@
processes of this swap shall be
killed. One of
,
- ,
,
.