X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.swap.xml;h=44c16e7bcc969d59f529504c2867ea67e50f2b60;hb=d55192add75584f55932ad463ee6b4cc30370c63;hp=dae9d59e7c9300f03c75d1f4bf6e66779c6c8a03;hpb=9cc2c8b763fb4b9ddda95756a727a438a0d2a012;p=elogind.git
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
index dae9d59e7..44c16e7bc 100644
--- a/man/systemd.swap.xml
+++ b/man/systemd.swap.xml
@@ -48,14 +48,14 @@
- systemd.swap
+ swap.swapDescriptionA unit configuration file whose name ends in
- .swap encodes information about a
+ .swap encodes information about a
swap device or file for memory paging controlled and
supervised by systemd.
@@ -73,16 +73,19 @@
which define the execution environment the
swapon8
binary is executed in, and in
- systemd.kill5
+ systemd.kill5,
which define the way the processes are
- terminated.
+ terminated, and in
+ systemd.resource-control5,
+ which configure resource control settings for the
+ processes of the service.
Swap units must be named after the devices
or files they control. Example: the swap device
- /dev/sda5 must be configured in a
+ /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
@@ -111,7 +114,7 @@
for details about the conversion.If a swap device or file is configured in both
- /etc/fstab and a unit file the
+ /etc/fstab and a unit file, the
configuration in the latter takes precedence.Unless the option is set
@@ -136,7 +139,7 @@
options specific to the [Swap] section of swap units
are the following:
-
+ What=
@@ -167,24 +170,40 @@
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
wait for the swapon command to
finish. If a command does not exit
- within the configured time the swap
+ within the configured time, the swap
will be considered failed and be shut
down again. All commands still running
will be terminated forcibly via
- SIGTERM, and after another delay of
- this time with SIGKILL. (See
+ SIGTERM, and after another delay of
+ this time with SIGKILL. (See
in
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
- 90s.
+ 20s". Pass 0 to disable the timeout
+ logic. Defaults to DefaultTimeoutStartSec= from the
+ manager configuration file
+ (see systemd-system.conf5).
+
@@ -199,10 +218,11 @@
See Alsosystemd1,
- systemctl8,
+ systemctl1,
systemd.unit5,
systemd.exec5,
systemd.kill5,
+ systemd.resource-control5,
systemd.device5,
systemd.mount5,
swapon8,