X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-cryptsetup-generator.xml;h=795003294191d812edbbc7bd73aede48236485c6;hb=fcdfc159248fa484f443e17ab2bde8e354ecc560;hp=49d4d5545b810a683c57e24481eca4b53cae72d2;hpb=bb31a4ac1997c189a344caf554f34c6aabc71aa7;p=elogind.git
diff --git a/man/systemd-cryptsetup-generator.xml b/man/systemd-cryptsetup-generator.xml
index 49d4d5545..795003294 100644
--- a/man/systemd-cryptsetup-generator.xml
+++ b/man/systemd-cryptsetup-generator.xml
@@ -19,7 +19,7 @@
You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see .
-->
-
+
systemd-cryptsetup-generator
@@ -72,7 +72,7 @@
systemd-cryptsetup-generator understands
the following kernel command line parameters:
-
+
luks=
rd.luks=
@@ -128,7 +128,31 @@
(initrd) while
luks.uuid= is
honored by both the main system and
- the initrd.
+ 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
+ specified on the kernel command line
+ will be activated in the initrd or the real root.
+
+
+
+ luks.key=
+ rd.luks.key=
+
+ Takes a password file as argument.
+ 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
+ rd.luks.key=
+ is honored only by initial RAM disk
+ (initrd) while
+ luks.key= is
+ honored by both the main system and
+ the initrd.
+