X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.mount.xml;h=2352b6a8fe15fad7ed4fd19bc1b9b7bf9c3f5d3a;hb=88e995fd720a93460e7c3f38ac24512e6d96b3e8;hp=94ed66453a644cd6bacd1d458a5d3964291d961b;hpb=65232ea79d8f6b1288c33852f89b575a9200162d;p=elogind.git
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index 94ed66453..2352b6a8f 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 .
-->
@@ -69,10 +69,13 @@
in the [Mount] section.
Additional options are listed in
- systemd.exec5.
+ systemd.exec5,
+ which define the execution environment the
+ mount8
+ binary is executed in.
- Mount units must be named after the file paths
- they reflect. Example: the mount point
+ Mount units must be named after the mount point
+ directories they control. Example: the mount point
/home/lennart must be configured
in a unit file
home-lennart.mount. For details
@@ -84,10 +87,19 @@
an automount unit, to allow on-demand or parallelized
mounting. See
systemd.automount5.
+
+ If an mount point is beneath another mount point
+ in the file system hierarchy, a dependency between both
+ units is created automatically.
+
+ Mount points created at runtime independent on
+ unit files or /etc/fstab will be
+ monitored by systemd and appear like any other mount
+ unit in systemd.
- fstab
+ /etc/fstabMount units may either be configured via unit
files, or via /etc/fstab (see
@@ -98,19 +110,30 @@
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
+ is set in
+ system.conf (which is the
+ default), or if is
+ specified as mount option, then 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
+ /etc/fstab and a unit file, the
configuration in the latter takes precedence.
@@ -135,7 +158,7 @@
resource to mount. See
mount8
for details. If this refers to a
- device node a dependency on the
+ device node, a dependency on the
respective device unit is
automatically created. (See
systemd.device5 for more information.)
@@ -148,7 +171,7 @@
Takes an absolute path
of a directory of the mount point. If
the mount point is not existing at
- time of mounting it is created. This
+ time of mounting, it is created. This
string must be reflected in the unit
file name. (See above.) This option is
mandatory.
@@ -168,7 +191,7 @@
Mount options to use
when mounting. This takes a comma
- seperated list of options. This
+ separated list of options. This
setting is optional.
@@ -179,7 +202,8 @@
are automatically created if
needed. This option specifies the file
system access mode used when creating
- these directories. Defaults to
+ these directories. Takes an access
+ mode in octal notation. Defaults to
0755.
@@ -187,7 +211,7 @@
TimeoutSec=Configures the time to
wait for the mount command to
- finish. If a comand does not exit
+ finish. If a command does not exit
within the configured time the mount
will be considered failed and be shut
down again. All commands still running
@@ -199,7 +223,7 @@
a time span value such as "5min
20s". Pass 0 to disable the timeout
logic. Defaults to
- 60s.
+ 90s.
@@ -208,7 +232,6 @@
processes of this mount shall be
killed. One of
,
- ,
,
.
@@ -218,13 +241,32 @@
systemd.service5
for details.
+
+
+ KillSignal=
+ Specifies which signal
+ to use when killing a process of this
+ mount. Defaults to SIGTERM.
+
+
+
+
+ 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".
+
+ See Also
- systemd8,
+ systemd1,
systemctl8,
systemd.unit5,
systemd.exec5,