summaryrefslogtreecommitdiff
path: root/man/crypttab.xml
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-12-12 20:51:24 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-12-12 20:51:24 +0100
commit5d0e48519b7160bacbfdc4d0703b2650401df588 (patch)
treef68dbcf48f6b4b776170cce3dab8904c664c6e18 /man/crypttab.xml
parentb4b36f4405b7fba0deb2a0d6b5379e7ef66e5c61 (diff)
downloadsystemd-5d0e48519b7160bacbfdc4d0703b2650401df588.tar.gz
man: explain noauto/nofail more carefully in crypttab
https://bugzilla.redhat.com/show_bug.cgi?id=1524759
Diffstat (limited to 'man/crypttab.xml')
-rw-r--r--man/crypttab.xml17
1 files changed, 12 insertions, 5 deletions
diff --git a/man/crypttab.xml b/man/crypttab.xml
index 474d3d83e0..dc43257d4e 100644
--- a/man/crypttab.xml
+++ b/man/crypttab.xml
@@ -218,16 +218,23 @@
<varlistentry>
<term><option>noauto</option></term>
- <listitem><para>This device will not be automatically unlocked
- on boot.</para></listitem>
+ <listitem><para>This device will not be added to <filename>cryptsetup.target</filename>.
+ This means that it will not be automatically unlocked on boot, unless something else pulls
+ it in. In particular, if the device is used for a mount point, it'll be unlocked
+ automatically during boot, unless the mount point itself is also disabled with
+ <option>noauto</option>.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>nofail</option></term>
- <listitem><para>The system will not wait for the device to
- show up and be unlocked at boot, and not fail the boot if it
- does not show up.</para></listitem>
+ <listitem><para>This device will not be a hard dependency of
+ <filename>cryptsetup.target</filename>. It'll be still pulled in and started, but the system
+ will not wait for the device to show up and be unlocked, and boot will not fail if this is
+ unsuccessful. Note that other units that depend on the unlocked device may still fail. In
+ particular, if the device is used for a mount point, the mount point itself is also needs to
+ have <option>noauto</option> option, or the boot will fail if the device is not unlocked
+ successfully.</para></listitem>
</varlistentry>
<varlistentry>