X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.mount.xml;h=657cf11be36bcc0ae056cba23f7f97717718d8c3;hb=e4e703c3076cb5060ab401a2370ab84883f2fd8f;hp=e5b5c3c7c33b92451b9f28b292569838f5f05c22;hpb=79640424059328268b9fb6c5fa8eb777b27a177e;p=elogind.git
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index e5b5c3c7c..657cf11be 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -76,8 +76,8 @@
systemd.kill5,
which define the way the processes are terminated, and
in
- systemd.cgroup5,
- which configure control group settings for the
+ 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
@@ -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
@@ -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.
@@ -159,6 +162,21 @@
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
@@ -260,8 +278,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.
@@ -272,28 +290,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
@@ -302,7 +298,7 @@
systemd.unit5,
systemd.exec5,
systemd.kill5,
- systemd.cgroup5,
+ systemd.resource-control5,
systemd.service5,
systemd.device5,
proc5,