aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarald Hoyer <harald@redhat.com>2013-04-11 15:44:33 +0200
committerLennart Poettering <lennart@poettering.net>2013-04-18 02:45:01 +0200
commit951657bd0a5bb32b5f56cc6b91ad2ea4094bdfaf (patch)
tree6bfa3c0784b1ee49361265bfd1133e975e8a403f /man/kernel-command-line.xml
parentman: document that timeout=0 is the default for entries in crypttab (diff)
downloadsystemd-951657bd0a5bb32b5f56cc6b91ad2ea4094bdfaf.tar.gz
systemd-951657bd0a5bb32b5f56cc6b91ad2ea4094bdfaf.tar.bz2
systemd-951657bd0a5bb32b5f56cc6b91ad2ea4094bdfaf.zip
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/kernel-command-line.xml')
-rw-r--r--man/kernel-command-line.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml
index f24979817..6d064f637 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