X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=man%2Fsystemd.mount.xml;h=8527386594fb6e036a2189d57b8563b0fb2cab64;hb=ae6c3cc009a21df4b51851fb8fe3fde0b7d6d8f0;hp=f32861b159ed48cd7f766f5ccc1c1697b74137f5;hpb=878836df2d714a9580ad31b9db88fda862e0df50;p=elogind.git
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index f32861b15..852738659 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -48,14 +48,14 @@
- 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.
@@ -73,19 +73,28 @@
which define the execution environment the
mount8
binary is executed in, and in
- systemd.kill5
- which define the way the processes are
- terminated. The User= and Group= options are not useful
- for mount units specifying a Type= option; the mount
- binary must run as root if there is a specified type.
+ systemd.kill5,
+ which define the way the processes are terminated, and
+ in
+ systemd.resource-control5,
+ which configure resource control 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 are not 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
- path to a unit name see
+ path to a unit name, see
systemd.unit5.Optionally, a mount unit may be accompanied by
@@ -97,14 +106,25 @@
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.
- /etc/fstab
+ fstabMount units may either be configured via unit
files, or via /etc/fstab (see
@@ -112,36 +132,103 @@
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
+ configuration of the system manager is reloaded. In
+ general, configuring mount points through
+ /etc/fstab is the preferred
+ approach. 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. systemd
- will create a dependency of type
- from either
- local-fs.target or
+ points. systemd will create a dependency of type
+ or
+ (see option below), 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
- systemd.automount5
- 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.
+ whether the file system is local or remote.
+
+
+
+
+
+
+ An automount unit will be created
+ for the file system. See
+ systemd.automount5
+ for details.
+
+
+
+
+
+ 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 append a unit as
+ s, min,
+ h,
+ ms.
+
+ Note that this option can only be used in
+ /etc/fstab, and will be
+ ignored when part of Options=
+ setting in a unit file.
+
+
+
+
+
+
+
+ With , this
+ mount will not be added as a dependency for
+ local-fs.target or
+ remote-fs.target. This means
+ that it will not be mounted automatically during
+ boot, unless it is pulled in by some other
+ unit. Option has the
+ opposite meaning and is the default.
+
+
+
+
+
+
+ With this
+ mount will be only wanted, not required, by
+ local-fs.target or
+ remote-fs.target. This means
+ that the boot will continue even if this mount
+ point is not mounted successfully.
+
+
+
+
+
+
+ An additional filesystem to be
+ mounted in the initramfs. See
+ initrd-fs.target description
+ in
+ systemd.special7.
+
+
+ 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.
@@ -158,7 +245,7 @@
options specific to the [Mount] section of mount
units are the following:
-
+ What=
@@ -182,14 +269,14 @@
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.
@@ -199,11 +286,26 @@
Options=Mount options to use
- when mounting. This takes a comma
- separated list of options. This
+ when mounting. This takes a
+ comma-separated list of options. This
setting is optional.
+
+ SloppyOptions=
+
+ Takes a boolean
+ argument. If true, parsing of the
+ options specified in
+ Options= is
+ relaxed, and unknown mount options are
+ tolerated. This corresponds with
+ mount8's
+ -s
+ switch. Defaults to
+ off.
+
+
DirectoryMode=Directories of mount
@@ -221,19 +323,19 @@
Configures the time to
wait for the mount command to
finish. If a command does not exit
- within the configured time the mount
+ 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
+ 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
- 90s.
+ logic. The default value is set from the manager configuration
+ file's DefaultTimeoutStart= variable.
@@ -244,40 +346,21 @@
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.
-
-
-
- FsckPassNo=
-
- The pass number for
- the file system checking service for
- this mount. See
- systemd.service5
- for more information on this setting.
-
-
-
-
-
See Alsosystemd1,
- systemctl8,
+ systemctl1,
systemd.unit5,
systemd.exec5,
systemd.kill5,
+ systemd.resource-control5,
systemd.service5,
systemd.device5,
+ proc5,
mount8,
- systemd-fstab-generator8
+ systemd-fstab-generator8,
+ systemd.directives7