X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.swap.xml;h=9cc3b80bb973f9a2a1fde8c29f1a90fc82c51b18;hb=ad4cdc551588ee543ab1c2b3adfcadf0a2040f23;hp=041123285307564d9d56793fd767fddfda3eb4b6;hpb=63ba209d8bc64137ff1585d5878328c93cb81b61;p=elogind.git
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
index 041123285..9cc3b80bb 100644
--- a/man/systemd.swap.xml
+++ b/man/systemd.swap.xml
@@ -85,7 +85,7 @@
/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
+ file system path to a unit name, see
systemd.unit5.
All swap units automatically get the appropriate
@@ -117,12 +117,37 @@
/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.
+ When reading /etc/fstab a
+ few special options are understood by systemd which
+ influence how dependencies are created for swap
+ units.
+
+
+
+
+
+
+ With the
+ swap unit will not be added as a dependency for
+ swap.target. This means that
+ it will not be activated automatically during
+ boot, unless it is pulled in by some other
+ unit. Option has the
+ opposite meaning and is the default.
+
+
+
+
+
+
+ With the
+ swap unit will be only wanted, not required by
+ swap.target. This means that
+ the boot will continue even if this swap device is
+ not activated successfully.
+
+
+
@@ -170,6 +195,20 @@
setting is optional.
+
+ Options=
+
+ May contain an option
+ string for the swap device. This may
+ be used for controlling discard
+ options among other functionality, if
+ the swap backing device supports the
+ discard or trim operation. (See
+ swapon8
+ for more information.)
+
+
+
TimeoutSec=Configures the time to
@@ -185,9 +224,11 @@
systemd.kill5.)
Takes a unit-less value in seconds, or
a time span value such as "5min
- 20s". Pass 0 to disable the timeout
- logic. Defaults to TimeoutStartSec= from the
- manager configuration file.
+ 20s". Pass 0 to disable the timeout
+ logic. Defaults to DefaultTimeoutStartSec= from the
+ manager configuration file
+ (see systemd-system.conf5).
+
@@ -202,7 +243,7 @@
See Alsosystemd1,
- systemctl8,
+ systemctl1,
systemd.unit5,
systemd.exec5,
systemd.kill5,