X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.mount.xml;h=126b75cb196fef46421a632f93e352ab702a5497;hb=ded21b6de3826c6d7a22aa67dc538e2417f43b70;hp=c57f613290dc3d95590152700837d078dd57981e;hpb=479fe882ae92e4c2eac3c995cd0d23d4c604889f;p=elogind.git
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index c57f61329..126b75cb1 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -73,14 +73,18 @@
which define the execution environment the
mount8
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;
+ 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 aren't listed in
+ will refuse options that are not listed in
/etc/fstab if it is not run as
UID 0.
@@ -90,7 +94,7 @@
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
@@ -128,7 +132,10 @@
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.
@@ -147,7 +154,7 @@
systemd.automount5
for details. If
is
- specified it may be used to configure how long systemd
+ 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
@@ -155,11 +162,26 @@
s, min,
h, ms.
+ If is given, this mount
+ will be only wanted, not required, by the
+ local-fs.target. This means that
+ the boot will continue even if this mount point is not
+ mounted successfully. Option has
+ the opposite meaning and is the default.
+
+ If is given, this mount
+ will not be added as a dependency for
+ local-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.
+
If a mount point is configured in both
/etc/fstab and a unit file that
- is stored below /usr the former
+ is stored below /usr, the former
will take precedence. If the unit file is stored below
- /etc it will take
+ /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
@@ -228,6 +250,21 @@
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
@@ -256,8 +293,8 @@
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.
@@ -268,28 +305,6 @@
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 Also
@@ -298,6 +313,7 @@
systemd.unit5,
systemd.exec5,
systemd.kill5,
+ systemd.resource-control5,
systemd.service5,
systemd.device5,
proc5,