X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.swap.xml;h=dae9d59e7c9300f03c75d1f4bf6e66779c6c8a03;hb=55c0b89c575fcb2c075286d444ed4fb1cf8c8563;hp=ab00f9f3186251f3808bcca38865e4238a32c7e6;hpb=19c5f19d69bb5f520fa7213239490c55de06d99d;p=elogind.git
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
index ab00f9f31..dae9d59e7 100644
--- a/man/systemd.swap.xml
+++ b/man/systemd.swap.xml
@@ -9,16 +9,16 @@
Copyright 2010 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see .
-->
@@ -44,7 +44,7 @@
systemd.swap
- systemd swap configuration files
+ Swap unit configuration
@@ -68,8 +68,17 @@
specific configuration options are configured in the
[Swap] section.
+ Additional options are listed in
+ systemd.exec5,
+ which define the execution environment the
+ swapon8
+ binary is executed in, and in
+ systemd.kill5
+ which define the way the processes are
+ terminated.
+
Swap units must be named after the devices
- (resp. files) they control. Example: the swap device
+ 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
@@ -77,8 +86,8 @@
systemd.unit5.All swap units automatically get the appropriate
- dependencies on the devices (resp. on the mount points
- of the files) they are activated from.
+ dependencies on the devices or on the mount points
+ of the files they are activated from.
Swap units with
DefaultDependencies= enabled
@@ -93,7 +102,13 @@
Swap units may either be configured via unit
files, or via /etc/fstab (see
fstab5
- for details).
+ for details). Swaps listed in
+ /etc/fstab will be converted into
+ native units dynamically at boot and when the
+ configuration of the system manager is
+ reloaded. See
+ systemd-fstab-generator8
+ for details about the conversion.If a swap device or file is configured in both
/etc/fstab and a unit file the
@@ -115,7 +130,9 @@
supervises. A number of options that may be used in
this section are shared with other unit types. These
options are documented in
- systemd.exec5. The
+ systemd.exec5
+ and
+ systemd.kill5. The
options specific to the [Swap] section of swap units
are the following:
@@ -161,49 +178,21 @@
will be terminated forcibly via
SIGTERM, and after another delay of
this time with SIGKILL. (See
- below.)
+ 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.
-
-
- KillMode=
- Specifies how
- processes of this swap shall be
- killed. One of
- ,
- ,
- .
-
- This option is mostly equivalent
- to the
- option of service files. See
- systemd.service5
- for details.
-
-
-
- KillSignal=
- Specifies which signal
- to use when killing a process of this
- swap. Defaults to SIGTERM.
-
-
-
-
- SendSIGKILL=
- Specifies whether to
- send SIGKILL to remaining processes
- after a timeout, if the normal
- shutdown procedure left processes of
- the swap around. Takes a boolean
- value. Defaults to "yes".
-
-
+
+ Check
+ systemd.exec5
+ and
+ systemd.kill5
+ for more settings.
@@ -213,9 +202,12 @@
systemctl8,
systemd.unit5,
systemd.exec5,
+ systemd.kill5,
systemd.device5,
systemd.mount5,
- swapon8
+ swapon8,
+ systemd-fstab-generator8,
+ systemd.directives7