shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-18 21:57:48 +03:00
Code

Merge pull request #7620 from keszybz/two-docs

Browse Source 
Two docs
This commit is contained in:
Lennart Poettering 2017-12-23 12:40:48 +01:00 committed by GitHub
commit 186d5f2e79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
man/crypttab.xml
View File

@ -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>

8
man/halt.xml
View File

@ -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>