X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.swap.xml;h=492309e5363adfca1428462ba277e2004f1b816d;hb=f47c5c47d1a7bcfa1842ff7cc52b1f7fc1d86bcf;hp=d931c46e8032358762430be9dfc689e06f939d2f;hpb=479fe882ae92e4c2eac3c995cd0d23d4c604889f;p=elogind.git
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
index d931c46e8..492309e53 100644
--- a/man/systemd.swap.xml
+++ b/man/systemd.swap.xml
@@ -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
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
@@ -172,7 +175,7 @@
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
@@ -183,8 +186,8 @@
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.
+ logic. Defaults to TimeoutStartSec= from the
+ manager configuration file.
@@ -203,6 +206,7 @@
systemd.unit5,
systemd.exec5,
systemd.kill5,
+ systemd.resource-control5,
systemd.device5,
systemd.mount5,
swapon8,