X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.mount.xml;h=bcaae33418002c90210bb7338a507b614fa00e33;hp=dd66d2ad72c11030f83e0d3f12822dece1f0d977;hb=4819ff0358b6317c195fd4b1768e03d09c871070;hpb=cd25cce98f5cc930202212c3c9c13605c09698b4 diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml index dd66d2ad7..bcaae3341 100644 --- a/man/systemd.mount.xml +++ b/man/systemd.mount.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.mount - systemd mount configuration files + Mount unit configuration @@ -72,7 +72,10 @@ systemd.exec5, which define the execution environment the mount8 - binary is executed in. + binary is executed in, and in + systemd.kill5 + which define the way the processes are + terminated. Mount units must be named after the mount point directories they control. Example: the mount point @@ -99,27 +102,40 @@ - <filename>fstab</filename> + <filename>/etc/fstab</filename> Mount units may either be configured via unit files, or via /etc/fstab (see fstab5 - for details). + for details). Mounts 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. When reading /etc/fstab a few special mount options are understood by systemd which influence how dependencies are created for mount - points from /etc/fstab. If - is specified as - mount option, then systemd will create a dependency of - type from either + points from /etc/fstab. systemd + will create a dependency of type + from either local-fs.target or remote-fs.target, depending whether the file system is local or remote. If - is set, an - automount unit will be created for the file system. See + is set, an + automount unit will be created for the file + system. See systemd.automount5 - for details. + for details. If + is + specified it may be used to configure how long systemd + should wait for a device to show up before giving up + on an entry from + /etc/fstab. Specify a time in + seconds or explicitly specifiy a unit as + s, min, + h, ms. If a mount point is configured in both /etc/fstab and a unit file, the @@ -134,7 +150,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 [Mount] section of mount units are the following: @@ -207,46 +225,40 @@ 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. + 90s. + - - KillMode= - Specifies how - processes of this mount shall be - killed. One of - , - , - . - - This option is mostly equivalent - to the - option of service files. See - systemd.service5 - for details. - + Check + systemd.exec5 + and + systemd.kill5 + for more settings. + - - KillSignal= - Specifies which signal - to use when killing a process of this - mount. Defaults to SIGTERM. - - + + Compatibility Options + + The following option is also available in the + [Mount] section, but exists purely + for compatibility reasons and should not be used in + newly written mount files. + - SendSIGKILL= - Specifies whether to - send SIGKILL to remaining processes - after a timeout, if the normal - shutdown procedure left processes of - the mount around. Takes a boolean - value. Defaults to "yes". + FsckPassNo= + + The pass number for + the file system checking service for + this mount. See + systemd.service5 + for more information on this setting. @@ -259,8 +271,11 @@ systemctl8, systemd.unit5, systemd.exec5, + systemd.kill5, + systemd.service5, systemd.device5, - mount8 + mount8, + systemd-fstab-generator8