summaryrefslogtreecommitdiff
path: root/man/systemd.mount.xml
diff options
context:
space:
mode:
Diffstat (limited to 'man/systemd.mount.xml')
-rw-r--r--man/systemd.mount.xml41
1 files changed, 31 insertions, 10 deletions
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index 78b5f5257c..21177a2623 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -48,7 +48,7 @@
</refnamediv>
<refsynopsisdiv>
- <para><filename>systemd.mount</filename></para>
+ <para><filename><replaceable>mount</replaceable>.mount</filename></para>
</refsynopsisdiv>
<refsect1>
@@ -86,7 +86,7 @@
<para>Mount units must be named after the mount point
directories they control. Example: the mount point
- <filename>/home/lennart</filename> must be configured
+ <filename noindex='true'>/home/lennart</filename> must be configured
in a unit file
<filename>home-lennart.mount</filename>. For details
about the escaping logic used to convert a file system
@@ -102,10 +102,21 @@
in the file system hierarchy, a dependency between both
units is created automatically.</para>
- <para>Mount points created at runtime independent on
- unit files or <filename>/etc/fstab</filename> will be
+ <para>Mount points created at runtime (independently of
+ unit files or <filename>/etc/fstab</filename>) will be
monitored by systemd and appear like any other mount
- unit in systemd.</para>
+ unit in systemd.
+ See <filename>/proc/self/mountinfo</filename> description
+ in <citerefentry><refentrytitle>proc</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
+ </para>
+
+ <para>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 <ulink
+ url="http://www.freedesktop.org/wiki/Software/systemd/APIFileSystems">API
+ File Systems</ulink>.</para>
</refsect1>
<refsect1>
@@ -145,8 +156,16 @@
<literal>h</literal>, <literal>ms</literal>.</para>
<para>If a mount point is configured in both
- <filename>/etc/fstab</filename> and a unit file, the
- configuration in the latter takes precedence.</para>
+ <filename>/etc/fstab</filename> and a unit file that
+ is stored below <filename>/usr</filename> the former
+ will take precedence. If the unit file is stored below
+ <filename>/etc</filename> 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
+ <filename>/etc</filename> will always take precedence
+ over configuration in
+ <filename>/usr</filename>.</para>
</refsect1>
<refsect1>
@@ -163,7 +182,7 @@
options specific to the [Mount] section of mount
units are the following:</para>
- <variablelist>
+ <variablelist class='unit-directives'>
<varlistentry>
<term><varname>What=</varname></term>
@@ -257,7 +276,7 @@
for compatibility reasons and should not be used in
newly written mount files.</para>
- <variablelist>
+ <variablelist class='unit-directives'>
<varlistentry>
<term><varname>FsckPassNo=</varname></term>
@@ -281,8 +300,10 @@
<citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd.device</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>proc</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>mount</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
- <citerefentry><refentrytitle>systemd-fstab-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+ <citerefentry><refentrytitle>systemd-fstab-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry>
</para>
</refsect1>