X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.mount.xml;h=f116aa577c52f4aeb19dc1cd156b8672d1375795;hb=42483a747489ff46aed3588b78bf4b9480dbeaf7;hp=217289ab75f8a214a9261db359e6e3af4439e70b;hpb=accdd018ede77ef1c057775396c18c73406cbcb4;p=elogind.git
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index 217289ab7..f116aa577 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -94,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
@@ -111,7 +111,7 @@
monitored by systemd and appear like any other mount
unit in systemd.
See /proc/self/mountinfo description
- in proc5.
+ in proc5.
Some file systems have special semantics as API
@@ -132,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.
@@ -141,23 +144,81 @@
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
+ 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 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.
+
+
+
+
+
+
+
+ With , 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.
+
+
+
+
+
+
+ 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 that
@@ -232,6 +293,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
@@ -260,8 +336,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.
@@ -283,7 +359,7 @@
systemd.resource-control5,
systemd.service5,
systemd.device5,
- proc5,
+ proc5,
mount8,
systemd-fstab-generator8,
systemd.directives7