summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorChristian Seiler <christian@iwakd.de>2014-01-26 12:02:49 +0100
committerTom Gundersen <teg@jklm.no>2014-01-26 13:24:01 +0100
commitb4a11878f2fdf5b07f895863747153de632ff4e6 (patch)
treefdf2de6965cc0e56a60777f7cba98a545a158316 /man
parent0a75bc612dc8b220fc86479a89e0fe35dfcc48bc (diff)
cryptsetup: Support key-slot option
Debian recently introduced the option key-slot to /etc/crypttab to specify the LUKS key slot to be used for decrypting the device. On systems where a keyfile is used and the key is not in the first slot, this can speed up the boot process quite a bit, since cryptsetup does not need to try all of the slots sequentially. (Unsuccessfully testing a key slot typically takes up to about 1 second.) This patch makes systemd aware of this option. Debian bug that introduced the feature: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=704470
Diffstat (limited to 'man')
-rw-r--r--man/crypttab.xml14
1 files changed, 14 insertions, 0 deletions
diff --git a/man/crypttab.xml b/man/crypttab.xml
index 90d8ce95fe..5f386e55f8 100644
--- a/man/crypttab.xml
+++ b/man/crypttab.xml
@@ -164,6 +164,20 @@
</varlistentry>
<varlistentry>
+ <term><varname>key-slot=</varname></term>
+
+ <listitem><para>Specifies the key slot to
+ compare the passphrase or key against.
+ If the key slot does not match the given
+ passphrase or key, but another would, the
+ setup of the device will fail regardless.
+ This implies <varname>luks</varname>. See
+ <citerefentry><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+ for possible values. The default is to try
+ all key slots in sequential order.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><varname>luks</varname></term>
<listitem><para>Force LUKS mode. When this mode