X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.mount.xml;h=bd50f352e7481d77a362fc37affcaf8d2210b572;hb=c736283bfb81f5b00756e08a13946c113a41527f;hp=2dc095e47b3fa5e1d18ab0cdcc811fb69e0079f6;hpb=9cc2c8b763fb4b9ddda95756a727a438a0d2a012;p=elogind.git
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index 2dc095e47..bd50f352e 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,20 +73,24 @@
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.
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
@@ -105,7 +109,10 @@
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
@@ -144,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
@@ -153,8 +160,16 @@
h, ms.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.
@@ -171,7 +186,7 @@
options specific to the [Mount] section of mount
units are the following:
-
+ What=
@@ -195,14 +210,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.
@@ -212,8 +227,8 @@
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.
@@ -234,19 +249,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.
@@ -257,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
@@ -287,8 +280,10 @@
systemd.unit5,
systemd.exec5,
systemd.kill5,
+ systemd.resource-control5,
systemd.service5,
systemd.device5,
+ proc5,
mount8,
systemd-fstab-generator8,
systemd.directives7