X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.swap.xml;h=1155758e28d86aeed6b095278edaab8a80412917;hb=6d0b55c272ea31d025e8b3c311cea8cda0bfefd7;hp=481dc524547b06d1a0a3933b0711148b30fdd3ef;hpb=86b23b07c96b185126bfbf217227dad362a20c25;p=elogind.git
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
index 481dc5245..1155758e2 100644
--- a/man/systemd.swap.xml
+++ b/man/systemd.swap.xml
@@ -117,12 +117,40 @@
/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. Option
+ has the opposite meaning and
+ is the default.
+
+
+
@@ -171,14 +199,14 @@
- Discard=
-
- Enable discards, if the swap
- backing device supports the discard or trim
- operation. Can be one of none,
- once, pages
- or all. Defaults to
- none. (See
+ 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.)
@@ -202,7 +230,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).