X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=man%2Fsystemd.swap.xml;h=9cc3b80bb973f9a2a1fde8c29f1a90fc82c51b18;hb=aceac2f0b652dff701e5815c51c2e372e8fee84d;hp=00fafdce2a1931bf7c4ef2dc4c504cd234b0d571;hpb=97426dcfca64b2a259d81335da1dab63fe6f51dd;p=elogind.git
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
index 00fafdce2..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.
+
+
+
@@ -171,14 +196,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.)