X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=man%2Fsystemd.mount.xml;h=214f40c74296aecd0a35720f879994b1dd38b3dc;hb=7abfbe7903d8e792850ec39286a3d86e616a6477;hp=94ed66453a644cd6bacd1d458a5d3964291d961b;hpb=65232ea79d8f6b1288c33852f89b575a9200162d;p=elogind.git
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index 94ed66453..214f40c74 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,18 +44,18 @@
systemd.mount
- systemd mount configuration files
+ Mount unit configuration
- systemd.mount
+ mount.mountDescriptionA unit configuration file whose name ends in
- .mount encodes information about
+ .mount encodes information about
a file system mount point controlled and supervised by
systemd.
@@ -69,11 +69,28 @@
in the [Mount] section.
Additional options are listed in
- systemd.exec5.
-
- Mount units must be named after the file paths
- they reflect. Example: the mount point
- /home/lennart must be configured
+ systemd.exec5,
+ which define the execution environment the
+ mount8
+ binary is executed in, and in
+ systemd.kill5,
+ which define the way the processes are terminated, and
+ in
+ systemd.cgroup5,
+ which configure control group settings for the
+ processes of the service. 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
in a unit file
home-lennart.mount. For details
about the escaping logic used to convert a file system
@@ -84,34 +101,75 @@
an automount unit, to allow on-demand or parallelized
mounting. See
systemd.automount5.
+
+ 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 (independently of
+ unit files or /etc/fstab) will be
+ monitored by systemd and appear like any other mount
+ 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.
- fstab
+ /etc/fstabMount 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 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.
@@ -122,11 +180,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=
@@ -135,7 +195,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.)
@@ -147,17 +207,17 @@
Where=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
+ 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
+ filename. (See above.) This option is
mandatory.Type=Takes a string for the
- filesystem type. See
+ file system type. See
mount8
for details. This setting is
optional.
@@ -167,8 +227,8 @@
Options=Mount options to use
- when mounting. This takes a comma
- seperated list of options. This
+ when mounting. This takes a
+ comma-separated list of options. This
setting is optional.
@@ -179,7 +239,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,36 +248,48 @@
TimeoutSec=Configures the time to
wait for the mount command to
- finish. If a comand does not exit
- within the configured time the mount
+ 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
will be terminated forcibly via
- SIGTERM, and after another delay of
- this time with SIGKILL. (See
- below.)
+ SIGTERM, and after another delay of
+ this time with SIGKILL. (See
+ 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.
+
+
+ Check
+ systemd.exec5
+ and
+ systemd.kill5
+ for more settings.
+
+
+ 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.
+
+
- KillMode=
- Specifies how
- processes of this mount shall be
- killed. One of
- ,
- ,
- ,
- .
-
- This option is mostly equivalent
- to the
- option of service files. See
+ FsckPassNo=
+
+ The pass number for
+ the file system checking service for
+ this mount. See
systemd.service5
- for details.
+ for more information on this setting.
+
@@ -224,12 +297,18 @@
See Also
- systemd8,
+ systemd1,
systemctl8,
systemd.unit5,
systemd.exec5,
+ systemd.kill5,
+ systemd.cgroup5,
+ systemd.service5,
systemd.device5,
- mount8
+ proc5,
+ mount8,
+ systemd-fstab-generator8,
+ systemd.directives7