X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-cryptsetup-generator.xml;h=3abb39d550b44f4bd72daf5cdd84f8c58714a95d;hb=9546c6ed678bf8fbb93b9be620c9727b0e3d58ae;hp=215ac2d125fe84c393d366071e9fdb74a6160281;hpb=79640424059328268b9fb6c5fa8eb777b27a177e;p=elogind.git
diff --git a/man/systemd-cryptsetup-generator.xml b/man/systemd-cryptsetup-generator.xml
index 215ac2d12..3abb39d55 100644
--- a/man/systemd-cryptsetup-generator.xml
+++ b/man/systemd-cryptsetup-generator.xml
@@ -115,8 +115,8 @@
luks.uuid=
rd.luks.uuid=
- Takes a LUKS super
- block UUID as argument. This will
+ Takes a LUKS superblock
+ UUID as argument. This will
activate the specified device as part
of the boot process as if it was
listed in
@@ -137,6 +137,29 @@
will be activated in the initrd or the real root.
+
+
+ luks.options=
+ rd.luks.options=
+
+ Takes a LUKS super
+ block UUID followed by an '=' and a string
+ of options separated by commas as argument.
+ This will override the options for the given
+ UUID.
+ If only a list of options, without an
+ UUID, is specified, they apply to any UUIDs not
+ specified elsewhere, and without an entry in
+ /etc/crypttab.
+ rd.luks.options=
+ is honored only by initial RAM disk
+ (initrd) while
+ luks.options= is
+ honored by both the main system and
+ the initrd.
+
+
+
luks.key=
rd.luks.key=