diff options
| author | Lennart Poettering <lennart@poettering.net> | 2017-12-23 12:40:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-23 12:40:48 +0100 |
| commit | 186d5f2e79a3b2b518abb3b480309186fcbb7b01 (patch) | |
| tree | e0f0c9dd39ef93b5affdad3b84615efbebd9e601 /man | |
| parent | 053114090b5ea0cb6f633134aec30cd261353573 (diff) | |
| parent | 2e772f3085202f1a9289b6976af8ae3490044056 (diff) | |
| download | systemd-186d5f2e79a3b2b518abb3b480309186fcbb7b01.tar.gz systemd-186d5f2e79a3b2b518abb3b480309186fcbb7b01.tar.bz2 systemd-186d5f2e79a3b2b518abb3b480309186fcbb7b01.zip | |
Merge pull request #7620 from keszybz/two-docs
Two docs
Diffstat (limited to 'man')
| -rw-r--r-- | man/crypttab.xml | 17 | ||||
| -rw-r--r-- | man/halt.xml | 8 |
2 files changed, 18 insertions, 7 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> diff --git a/man/halt.xml b/man/halt.xml index 0abcdb475c..78860d94dd 100644 --- a/man/halt.xml +++ b/man/halt.xml @@ -166,8 +166,12 @@ <refsect1> <title>Notes</title> - <para>These are legacy commands available for compatibility - only.</para> + <para>These commands are implemented in a way that preserves compatiblity with + the original SysV commands. + <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry> + verbs <command>halt</command>, <command>poweroff</command>, + <command>reboot</command> provide the same functionality with some additional + features.</para> </refsect1> <refsect1> |