summaryrefslogtreecommitdiff
path: root/man/systemd-cryptsetup-generator.xml
diff options
context:
space:
mode:
authorJan Janssen <medhefgo@web.de>2014-12-02 18:49:28 +0100
committerLennart Poettering <lennart@poettering.net>2014-12-05 01:27:00 +0100
commit0fa9e53d12a64981e071e0adb24698f4735e2599 (patch)
tree775ffdd515daa005ee9a0fc3f9c5ec56085e9842 /man/systemd-cryptsetup-generator.xml
parentdeb6120920e6341b1c16f5f088ab057358bb8fc4 (diff)
cryptsetup-generator: Split main() into more functions and use hasmaps
Diffstat (limited to 'man/systemd-cryptsetup-generator.xml')
-rw-r--r--man/systemd-cryptsetup-generator.xml9
1 files changed, 5 insertions, 4 deletions
diff --git a/man/systemd-cryptsetup-generator.xml b/man/systemd-cryptsetup-generator.xml
index 3abb39d550..ff94e88f99 100644
--- a/man/systemd-cryptsetup-generator.xml
+++ b/man/systemd-cryptsetup-generator.xml
@@ -120,7 +120,7 @@
activate the specified device as part
of the boot process as if it was
listed in
- <filename>/etc/fstab</filename>. This
+ <filename>/etc/crypttab</filename>. This
option may be specified more than once
in order to set up multiple
devices. <varname>rd.luks.uuid=</varname>
@@ -130,9 +130,10 @@
honored by both the main system and
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
+ the same UUID, then the name, keyfile and options
+ specified there will be used. Otherwise the device
+ will have the name <literal>luks-UUID</literal>.</para>
+ <para>If /etc/crypttab exists, only those UUIDs
specified on the kernel command line
will be activated in the initrd or the real root.</para>
</listitem>