X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.swap.xml;h=9cc3b80bb973f9a2a1fde8c29f1a90fc82c51b18;hp=62a4d08b9cc92d389d402f02e03a6c3c9648f626;hb=8937422f3b8c4a163ffa4df697ef2939161f4f53;hpb=67826132adfdf626413f08fb664debd4a7ec35b7
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
index 62a4d08b9..9cc3b80bb 100644
--- a/man/systemd.swap.xml
+++ b/man/systemd.swap.xml
@@ -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
@@ -188,7 +227,7 @@
20s". Pass 0 to disable the timeout
logic. Defaults to DefaultTimeoutStartSec= from the
manager configuration file
- (see systemd-systemd.conf5).
+ (see systemd-system.conf5).