X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.mount.xml;h=bd50f352e7481d77a362fc37affcaf8d2210b572;hb=a8053f197e228437a6c49101a7c513b4955f7883;hp=9aac94e1a1a00697b51220506917228f645c0132;hpb=6b4991cfde6c0a0b62e836ca75ae362779c474d4;p=elogind.git
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index 9aac94e1a..bd50f352e 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
@@ -151,7 +151,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
@@ -161,9 +161,9 @@
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
@@ -260,8 +260,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 +272,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 +280,7 @@
systemd.unit5,
systemd.exec5,
systemd.kill5,
- systemd.cgroup5,
+ systemd.resource-control5,
systemd.service5,
systemd.device5,
proc5,