X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.mount.xml;h=07f21025b8a1721b374a4378cdc076c5d897ffc7;hb=1fda0ab5fc9cf7454c8da32941e433dc38ba9991;hp=219ef6531e2e7f87b650d1c22ee8959c113bc2ef;hpb=f848f8d87e3aafa514e8134e3ecf2317d89420e0;p=elogind.git
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index 219ef6531..07f21025b 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -48,7 +48,7 @@
- systemd.mount
+ mount.mount
@@ -75,11 +75,18 @@
binary is executed in, and in
systemd.kill5
which define the way the processes are
- terminated.
+ 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;
+ mount8
+ will refuse options that aren't 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
@@ -95,10 +102,21 @@
in the file system hierarchy, a dependency between both
units is created automatically.
- Mount points created at runtime independent on
- unit files or /etc/fstab will be
+ 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
+ userspace-to-userpace interfaces. Some of them may not
+ be changed via mount units, and cannot be disabled.
+ For a longer discussion see API
+ File Systems.
@@ -138,8 +156,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.
@@ -156,7 +182,7 @@
options specific to the [Mount] section of mount
units are the following:
-
+ What=
@@ -180,14 +206,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.
@@ -197,8 +223,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.
@@ -219,12 +245,12 @@
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
@@ -250,7 +276,7 @@
for compatibility reasons and should not be used in
newly written mount files.
-
+ FsckPassNo=
@@ -274,8 +300,10 @@
systemd.kill5,
systemd.service5,
systemd.device5,
+ proc5,
mount8,
- systemd-fstab-generator8
+ systemd-fstab-generator8,
+ systemd.directives7