diff options
| author | Harald Hoyer <harald@redhat.com> | 2013-04-11 15:44:33 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-04-18 02:45:01 +0200 |
| commit | 951657bd0a5bb32b5f56cc6b91ad2ea4094bdfaf (patch) | |
| tree | 6bfa3c0784b1ee49361265bfd1133e975e8a403f /man | |
| parent | 8b95c916386eff949d5a8abadf82cda09799794f (diff) | |
cryptsetup-generator: add support for rd.luks.key=
Also clarify rd.luks.uuid and luks.uuid in the manual.
https://bugzilla.redhat.com/show_bug.cgi?id=905683
Diffstat (limited to 'man')
| -rw-r--r-- | man/kernel-command-line.xml | 2 | ||||
| -rw-r--r-- | man/systemd-cryptsetup-generator.xml | 26 |
2 files changed, 27 insertions, 1 deletions
diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml index f249798171..6d064f6373 100644 --- a/man/kernel-command-line.xml +++ b/man/kernel-command-line.xml @@ -237,6 +237,8 @@ <term><varname>rd.luks.crypttab=</varname></term> <term><varname>luks.uuid=</varname></term> <term><varname>rd.luks.uuid=</varname></term> + <term><varname>luks.key=</varname></term> + <term><varname>rd.luks.key=</varname></term> <listitem> <para>Configures the LUKS diff --git a/man/systemd-cryptsetup-generator.xml b/man/systemd-cryptsetup-generator.xml index 292e967bea..7950032941 100644 --- a/man/systemd-cryptsetup-generator.xml +++ b/man/systemd-cryptsetup-generator.xml @@ -128,7 +128,31 @@ (initrd) while <varname>luks.uuid=</varname> is honored by both the main system and - the initrd.</para></listitem> + the initrd.</para> + <para>If /etc/crypttab contains entries with + the same UUID, then the options for this entry + will be used.</para> + <para>If /etc/crypttab exists, only those UUID + specified on the kernel command line + will be activated in the initrd or the real root.</para> + </listitem> + </varlistentry> + <varlistentry> + <term><varname>luks.key=</varname></term> + <term><varname>rd.luks.key=</varname></term> + + <listitem><para>Takes a password file as argument.</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> + <para><varname>rd.luks.key=</varname> + is honored only by initial RAM disk + (initrd) while + <varname>luks.key=</varname> is + honored by both the main system and + the initrd.</para> + </listitem> </varlistentry> </variablelist> </refsect1> |