X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.swap.xml;h=30a15ecfc3bfd2313524937c2fc2603179efc940;hb=b43f208f78666fd27e274daa946ae57becd59dd6;hp=45f8f40ae1caf78084bfa4e81cafc634f7dd574d;hpb=ba035df230e41bf9d70ebb47915c9472b7884412;p=elogind.git
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
index 45f8f40ae..30a15ecfc 100644
--- a/man/systemd.swap.xml
+++ b/man/systemd.swap.xml
@@ -9,16 +9,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 .
-->
@@ -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 activated 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
,
- ,
,
.