X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-cryptsetup-generator.xml;h=c8753cef37dff7a88214fe98e25f9863750d2803;hb=49fba678a0e2c30df0d2ccefab731beb3955a473;hp=3abb39d550b44f4bd72daf5cdd84f8c58714a95d;hpb=72f4d9669c253d5bd7c126bf2e7a0db0198cf2eb;p=elogind.git
diff --git a/man/systemd-cryptsetup-generator.xml b/man/systemd-cryptsetup-generator.xml
index 3abb39d55..c8753cef3 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
- /etc/fstab. This
+ /etc/crypttab. This
option may be specified more than once
in order to set up multiple
devices. rd.luks.uuid=
@@ -130,14 +130,34 @@
honored by both the main system and
the initrd.
If /etc/crypttab contains entries with
- the same UUID, then the options for this entry
- will be used.
- 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 luks-UUID.
+ If /etc/crypttab exists, only those UUIDs
specified on the kernel command line
will be activated in the initrd or the real root.
+
+ luks.name=
+ rd.luks.name=
+
+ Takes a LUKS super
+ block UUID followed by an '=' and a name. This implies
+ rd.luks.uuid= or luks.uuid=
+ and will additionally make the LUKS device given by
+ the UUID appear under the provided name.
+
+ rd.luks.name=
+ is honored only by initial RAM disk
+ (initrd) while
+ luks.name= is
+ honored by both the main system and
+ the initrd.
+
+
+
luks.options=
rd.luks.options=
@@ -164,11 +184,16 @@
luks.key=
rd.luks.key=
- Takes a password file as argument.
+ Takes a password file name as argument or
+ a LUKS super block UUID followed by a '=' and a password
+ file name.
+
For those entries specified with
rd.luks.uuid= or luks.uuid=,
- the password file will be set to the password file specified by
- rd.luks.key= or luks.key
+ the password file will be set to the one specified by
+ rd.luks.key= or luks.key=
+ of the corresponding UUID, or the password file that was specified
+ without a UUID.
rd.luks.key=
is honored only by initial RAM disk
(initrd) while