diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-12-25 23:20:57 -0500 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-12-25 23:22:05 -0500 |
commit | 72ebbf3450340338d71ea2039dfb296bc1d595db (patch) | |
tree | 336b6c4ec94d1dbc5f7505e00edd7722cd604ffc /man/systemd.mount.xml | |
parent | 8b8f259170e35b93e6c6d1757cb8b835bbdaa40c (diff) |
man: document fail/nofail, auto/noauto
Also s/filesystem/file system/ in a few places.
Diffstat (limited to 'man/systemd.mount.xml')
-rw-r--r-- | man/systemd.mount.xml | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml index b181949b13..657cf11be3 100644 --- a/man/systemd.mount.xml +++ b/man/systemd.mount.xml @@ -132,7 +132,10 @@ for details). Mounts listed in <filename>/etc/fstab</filename> will be converted into native units dynamically at boot and when the - configuration of the system manager is reloaded. See + configuration of the system manager is reloaded. In + general, configuring mount points through + <filename>/etc/fstab</filename> is the preferred + approach. See <citerefentry><refentrytitle>systemd-fstab-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry> for details about the conversion.</para> @@ -159,6 +162,21 @@ <literal>s</literal>, <literal>min</literal>, <literal>h</literal>, <literal>ms</literal>.</para> + <para>If <option>nofail</option> is given, this mount + will be only wanted, not required, by the + <filename>local-fs.target</filename>. This means that + the boot will continue even if this mount point is not + mounted successfully. Option <option>fail</option> has + the opposite meaning and is the default.</para> + + <para>If <option>noauto</option> is given, this mount + will not be added as a dependency for + <filename>local-fs.target</filename>. This means that + it will not be mounted automatically during boot, + unless it is pulled in by some other unit. Option + <option>auto</option> has the opposite meaning and is + the default.</para> + <para>If a mount point is configured in both <filename>/etc/fstab</filename> and a unit file that is stored below <filename>/usr</filename>, the former |