diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-11-26 10:36:52 -0500 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2015-01-16 00:56:51 -0500 |
| commit | 4828bc7a05d3349919a3b0c61def4024569a2253 (patch) | |
| tree | d802455f15f073ea208eaa3d17d42a2eccc8d9ef /man | |
| parent | 79b4165b8468d2e753f6ce36ce5589f44be85691 (diff) | |
| download | systemd-4828bc7a05d3349919a3b0c61def4024569a2253.tar.gz | |
swap: restore support for nofail
systemd stops adding automatic dependencies on swap.target to swap
units. If a dependency is required, it has to be added by unit
configuration. fstab-generator did that already, except that now it is
modified to create a Requires or Wants type dependency, depending on
whether nofail is specified in /etc/fstab. This makes .swap units
obey the nofail/noauto options more or less the same as .mount units.
Documentation is extended to clarify that, and to make
systemd.mount(5) and system.swap(5) more similar. The gist is not
changed, because current behaviour actually matches existing
documentation.
https://bugs.freedesktop.org/show_bug.cgi?id=86488
(cherry picked from commit 5607d856b8606ba75446a07ab5e9048753e1d7a6)
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> |