summaryrefslogtreecommitdiff
path: root/man/systemd-cryptsetup-generator.xml
diff options
context:
space:
mode:
authorJan Janssen <medhefgo@web.de>2014-12-02 18:49:29 +0100
committerLennart Poettering <lennart@poettering.net>2014-12-05 01:29:43 +0100
commit6cd5b12aa5a62d6bf4afb78ec1a7787ff01b54ce (patch)
tree34406dfada5dec9e2a614b2cb826500d7dfb8416 /man/systemd-cryptsetup-generator.xml
parent0fa9e53d12a64981e071e0adb24698f4735e2599 (diff)
cryptsetup-generator: Add support for UUID-specific key files on kernel command line
Diffstat (limited to 'man/systemd-cryptsetup-generator.xml')
-rw-r--r--man/systemd-cryptsetup-generator.xml11
1 files changed, 8 insertions, 3 deletions
diff --git a/man/systemd-cryptsetup-generator.xml b/man/systemd-cryptsetup-generator.xml
index ff94e88f99..d4a9cc73ec 100644
--- a/man/systemd-cryptsetup-generator.xml
+++ b/man/systemd-cryptsetup-generator.xml
@@ -165,11 +165,16 @@
<term><varname>luks.key=</varname></term>
<term><varname>rd.luks.key=</varname></term>
- <listitem><para>Takes a password file as argument.</para>
+ <listitem><para>Takes a password file name as argument or
+ a LUKS super block UUID followed by a '=' and a password
+ file name.</para>
+
<para>For those entries specified with
<varname>rd.luks.uuid=</varname> or <varname>luks.uuid=</varname>,
- the password file will be set to the password file specified by
- <varname>rd.luks.key=</varname> or <varname>luks.key</varname></para>
+ the password file will be set to the one specified by
+ <varname>rd.luks.key=</varname> or <varname>luks.key=</varname>
+ of the corresponding UUID, or the password file that was specified
+ without a UUID.</para>
<para><varname>rd.luks.key=</varname>
is honored only by initial RAM disk
(initrd) while