X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.mount.xml;h=23e1e6c28eea439a3e8f45559d792a6342178ba8;hb=fcdfc159248fa484f443e17ab2bde8e354ecc560;hp=78b5f5257c3aea88603cd2782dffbf009be8edf2;hpb=8a1175118e7a2e60a6ec42624f915e26e821f4e8;p=elogind.git
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index 78b5f5257..23e1e6c28 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -48,7 +48,7 @@
- systemd.mount
+ mount.mount
@@ -102,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.
@@ -145,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.
@@ -163,7 +182,7 @@
options specific to the [Mount] section of mount
units are the following:
-
+
What=
@@ -257,7 +276,7 @@
for compatibility reasons and should not be used in
newly written mount files.
-
+
FsckPassNo=
@@ -281,8 +300,10 @@
systemd.kill5,
systemd.service5,
systemd.device5,
+ proc5,
mount8,
- systemd-fstab-generator8
+ systemd-fstab-generator8,
+ systemd.directives7