X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.swap.xml;h=78b04f58d93e04045b734ef13f2e2638788f4271;hb=fe59e38bef69568c385d10761132458606cdd896;hp=45467039e9e17b2842064c9682508d8911270ecb;hpb=2292707df5dda00662d0b4905c14aa4fa8d1f1fa;p=elogind.git
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
index 45467039e..78b04f58d 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,11 +44,11 @@
systemd.swap
- systemd swap configuration files
+ Swap unit configuration
- systemd.swap
+ swap.swap
@@ -68,13 +68,32 @@
specific configuration options are configured in the
[Swap] section.
- Swap units must be named after the devices they
- control. Example: the swap device
+ 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
+ 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
systemd.unit5.
+
+ All swap units automatically get the appropriate
+ dependencies on the devices or on the mount points
+ of the files they are activated from.
+
+ Swap units with
+ DefaultDependencies= enabled
+ implicitly acquire a conflicting dependency to
+ umount.target so that they are
+ deactivated at shutdown.
@@ -83,11 +102,24 @@
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
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.
@@ -98,11 +130,13 @@
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:
-
+ What=
@@ -144,39 +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
- 60s.
-
-
-
- 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.
-
+ 90s.
+
+ Check
+ systemd.exec5
+ and
+ systemd.kill5
+ for more settings.
@@ -186,9 +202,12 @@
systemctl8,
systemd.unit5,
systemd.exec5,
+ systemd.kill5,
systemd.device5,
systemd.mount5,
- swapon8
+ swapon8,
+ systemd-fstab-generator8,
+ systemd.directives7