diff options
Diffstat (limited to 'man')
| -rw-r--r-- | man/systemd.mount.xml | 37 | ||||
| -rw-r--r-- | man/systemd.swap.xml | 40 |
2 files changed, 53 insertions, 24 deletions
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml index ba841c3bab..6d8eae6a93 100644 --- a/man/systemd.mount.xml +++ b/man/systemd.mount.xml @@ -124,7 +124,7 @@ </refsect1> <refsect1> - <title><filename>/etc/fstab</filename></title> + <title><filename>fstab</filename></title> <para>Mount units may either be configured via unit files, or via <filename>/etc/fstab</filename> (see @@ -142,8 +142,7 @@ <para>When reading <filename>/etc/fstab</filename> a few special mount options are understood by systemd which influence how dependencies are created for mount - points from <filename>/etc/fstab</filename>. systemd - will create a dependency of type + points. systemd will create a dependency of type <option>Wants</option> or <option>Requires</option> (see option <option>nofail</option> below), from either <filename>local-fs.target</filename> or @@ -181,26 +180,13 @@ </varlistentry> <varlistentry> - <term><option>nofail</option></term> - <term><option>fail</option></term> - - <listitem><para>With <option>nofail</option> 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> - </listitem> - </varlistentry> - - <varlistentry> <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>. This means + <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. Option <option>auto</option> has the @@ -209,6 +195,21 @@ </varlistentry> <varlistentry> + <term><option>nofail</option></term> + <term><option>fail</option></term> + + <listitem><para>With <option>nofail</option> this + mount will be only wanted, not required, by + <filename>local-fs.target</filename> or + <filename>remote-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> + </listitem> + </varlistentry> + + <varlistentry> <term><option>x-initrd.mount</option></term> <listitem><para>An additional filesystem to be diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml index 44c16e7bcc..1155758e28 100644 --- a/man/systemd.swap.xml +++ b/man/systemd.swap.xml @@ -117,12 +117,40 @@ <filename>/etc/fstab</filename> and a unit file, the configuration in the latter takes precedence.</para> - <para>Unless the <option>noauto</option> option is set - for them all swap units configured in - <filename>/etc/fstab</filename> are also added as - requirements to <filename>swap.target</filename>, so - that they are waited for and activated during - boot.</para> + <para>When reading <filename>/etc/fstab</filename> a + few special options are understood by systemd which + influence how dependencies are created for swap + units.</para> + + <variablelist class='fstab-options'> + <varlistentry> + <term><option>noauto</option></term> + <term><option>auto</option></term> + + <listitem><para>With <option>noauto</option> the + swap unit will not be added as a dependency for + <filename>swap.target</filename>. This means that + it will not be activated 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> + </listitem> + </varlistentry> + + <varlistentry> + <term><option>nofail</option></term> + <term><option>fail</option></term> + + <listitem><para>With <option>nofail</option> the + swap unit will be only wanted, not required by + <filename>swap.target</filename>. This means that + the boot will continue even if this swap device is + not activated successfully. Option + <option>fail</option> has the opposite meaning and + is the default.</para> + </listitem> + </varlistentry> + </variablelist> </refsect1> <refsect1> |