X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.swap.xml;h=beb8dba210718629088b3051ef956bcf3220a7e0;hb=19125c205aa6084c225b5c11cc6dcbe18c6dbcc0;hp=45467039e9e17b2842064c9682508d8911270ecb;hpb=2292707df5dda00662d0b4905c14aa4fa8d1f1fa;p=elogind.git diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml index 45467039e..beb8dba21 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 . --> @@ -68,13 +68,23 @@ specific configuration options are configured in the [Swap] section. - Swap units must be named after the devices they - control. Example: the swap device + Swap units must be named after the devices + (resp. 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 (resp. 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 +93,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. @@ -149,7 +172,7 @@ a time span value such as "5min 20s". Pass 0 to disable the timeout logic. Defaults to - 60s. + 90s. @@ -158,7 +181,6 @@ processes of this swap shall be killed. One of , - , , . @@ -176,6 +198,17 @@ 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". + + @@ -188,7 +221,8 @@ systemd.exec5, systemd.device5, systemd.mount5, - swapon8 + swapon8, + systemd-fstab-generator8