X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.mount.xml;h=21177a26232605da1a99d318d62ff412d842786e;hb=785a51eb682136b2c7ee33fabe64c72d20fa37db;hp=105afb41eaac8979145964bb0f526f065acb6e95;hpb=34511ca7b166b0e89d08ff9870b0cf2624a7815f;p=elogind.git
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index 105afb41e..21177a262 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -48,7 +48,7 @@
- systemd.mount
+ mount.mount
@@ -72,11 +72,21 @@
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. Note that the User= and Group= options are
+ not particularly useful for mount units specifying a
+ Type= option or using configuration
+ not specified in /etc/fstab;
+ mount8
+ will refuse options that aren't listed in
+ /etc/fstab if it is not run as
+ UID 0.
Mount units must be named after the mount point
directories they control. Example: the mount point
- /home/lennart must be configured
+ /home/lennart must be configured
in a unit file
home-lennart.mount. For details
about the escaping logic used to convert a file system
@@ -88,14 +98,25 @@
mounting. See
systemd.automount5.
- If an mount point is beneath another mount point
+ If a 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
+ Mount points created at runtime (independently of
+ unit files or /etc/fstab) will be
monitored by systemd and appear like any other mount
- unit in systemd.
+ unit in systemd.
+ See /proc/self/mountinfo description
+ in proc5.
+
+
+ Some file systems have special semantics as API
+ file systems for kernel-to-userspace and
+ userspace-to-userpace interfaces. Some of them may not
+ be changed via mount units, and cannot be disabled.
+ For a longer discussion see API
+ File Systems.
@@ -130,13 +151,21 @@
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
+ seconds or explicitly specify a unit as
s, min,
h, ms.
If a mount point is configured in both
- /etc/fstab and a unit file, the
- configuration in the latter takes precedence.
+ /etc/fstab and a unit file that
+ is stored below /usr the former
+ will take precedence. If the unit file is stored below
+ /etc it will take
+ precedence. This means: native unit files take
+ precedence over traditional configuration files, but
+ this is superseded by the rule that configuration in
+ /etc will always take precedence
+ over configuration in
+ /usr.
@@ -147,11 +176,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 [Mount] section of mount
units are the following:
-
+ What=
@@ -172,7 +203,7 @@
Where=Takes an absolute path
of a directory of the mount point. If
- the mount point is not existing at
+ the mount point does not exist at the
time of mounting, it is created. This
string must be reflected in the unit
file name. (See above.) This option is
@@ -220,50 +251,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 mount 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
- 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".
-
-
-
+
+ Check
+ systemd.exec5
+ and
+ systemd.kill5
+ for more settings.
@@ -274,7 +276,7 @@
for compatibility reasons and should not be used in
newly written mount files.
-
+ FsckPassNo=
@@ -295,10 +297,13 @@
systemctl8,
systemd.unit5,
systemd.exec5,
+ systemd.kill5,
systemd.service5,
systemd.device5,
+ proc5,
mount8,
- systemd-fstab-generator8
+ systemd-fstab-generator8,
+ systemd.directives7