summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorJan Janssen <medhefgo@web.de>2014-12-02 18:49:30 +0100
committerLennart Poettering <lennart@poettering.net>2014-12-05 01:29:45 +0100
commitbaade8cc237c37bd8905d86ec6e9c7872d4abe03 (patch)
treeb32976b760d450aef3639ceb467f3058696f8881 /man
parent6cd5b12aa5a62d6bf4afb78ec1a7787ff01b54ce (diff)
cryptsetup-generator: Add support for naming luks devices on kernel cmdline
Diffstat (limited to 'man')
-rw-r--r--man/kernel-command-line.xml2
-rw-r--r--man/systemd-cryptsetup-generator.xml19
2 files changed, 21 insertions, 0 deletions
diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml
index 68460ac93d..e32ed1972e 100644
--- a/man/kernel-command-line.xml
+++ b/man/kernel-command-line.xml
@@ -283,6 +283,8 @@
<term><varname>rd.luks=</varname></term>
<term><varname>luks.crypttab=</varname></term>
<term><varname>rd.luks.crypttab=</varname></term>
+ <term><varname>luks.name=</varname></term>
+ <term><varname>rd.luks.name=</varname></term>
<term><varname>luks.uuid=</varname></term>
<term><varname>rd.luks.uuid=</varname></term>
<term><varname>luks.options=</varname></term>
diff --git a/man/systemd-cryptsetup-generator.xml b/man/systemd-cryptsetup-generator.xml
index d4a9cc73ec..c8753cef37 100644
--- a/man/systemd-cryptsetup-generator.xml
+++ b/man/systemd-cryptsetup-generator.xml
@@ -140,6 +140,25 @@
</varlistentry>
<varlistentry>
+ <term><varname>luks.name=</varname></term>
+ <term><varname>rd.luks.name=</varname></term>
+
+ <listitem><para>Takes a LUKS super
+ block UUID followed by an '=' and a name. This implies
+ <varname>rd.luks.uuid=</varname> or <varname>luks.uuid=</varname>
+ and will additionally make the LUKS device given by
+ the UUID appear under the provided name.</para>
+
+ <para><varname>rd.luks.name=</varname>
+ is honored only by initial RAM disk
+ (initrd) while
+ <varname>luks.name=</varname> is
+ honored by both the main system and
+ the initrd.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><varname>luks.options=</varname></term>
<term><varname>rd.luks.options=</varname></term>