aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2017-11-16 04:05:15 +0100
committerYu Watanabe <watanabe.yu+github@gmail.com>2017-11-16 12:05:15 +0900
commit0c08bc7f097a5a836ec946aba1d19660fbc80997 (patch)
tree5f30ea4f95668f534ca05a6f8c46ef5c0b98728e /man/systemd.mount.xml
parentman: document interaction of --root= and the user/group databases (#7344) (diff)
downloadsystemd-0c08bc7f097a5a836ec946aba1d19660fbc80997.tar.gz
systemd-0c08bc7f097a5a836ec946aba1d19660fbc80997.tar.bz2
systemd-0c08bc7f097a5a836ec946aba1d19660fbc80997.zip
man: document that noauto doesn't affect automount units configured through /etc/fstab (#7350)
Fixes: #6937
Diffstat (limited to 'man/systemd.mount.xml')
-rw-r--r--man/systemd.mount.xml13
1 files changed, 6 insertions, 7 deletions
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index 58cdb547e..94d657499 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -336,13 +336,12 @@
<term><option>noauto</option></term>
<term><option>auto</option></term>
- <listitem><para>With <option>noauto</option>, this mount will
- not be added as a dependency for
- <filename>local-fs.target</filename> or
- <filename>remote-fs.target</filename>. This means that it will
- not be mounted automatically during boot, unless it is pulled
- in by some other unit. The <option>auto</option> option has the
- opposite meaning and is the default.</para>
+ <listitem><para>With <option>noauto</option>, the mount unit will not be added as a dependency for
+ <filename>local-fs.target</filename> or <filename>remote-fs.target</filename>. This means that it will not be
+ mounted automatically during boot, unless it is pulled in by some other unit. The <option>auto</option> option
+ has the opposite meaning and is the default. Note that the <option>noauto</option> option has an effect on the
+ mount unit itself only — if <option>x-systemd.automount</option> is used (see above), then the matching
+ automount unit will still be pulled in by these targets.</para>
</listitem>
</varlistentry>