X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=man%2Fsystemd-cryptsetup-generator.xml;h=795003294191d812edbbc7bd73aede48236485c6;hb=1fda0ab5fc9cf7454c8da32941e433dc38ba9991;hp=ec2b5e4e329b50abb9d6c41307ac6c74646933c6;hpb=8fd1952fbec85a1b85a1e7e0ca5623f4933b137c;p=elogind.git
diff --git a/man/systemd-cryptsetup-generator.xml b/man/systemd-cryptsetup-generator.xml
index ec2b5e4e3..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=
@@ -83,9 +83,9 @@
no disables the
generator
entirely. rd.luks=
- is honoured only be initial RAM disk
+ is honored only by initial RAM disk
(initrd) while
- luks= is honoured
+ luks= is honored
by both the main system and the
initrd.
@@ -104,10 +104,10 @@
(luks.uuid= will
still work
however). rd.luks.crypttab=
- is honoured only be initial RAM disk
+ is honored only by initial RAM disk
(initrd) while
luks.crypttab= is
- honoured by both the main system and
+ honored by both the main system and
the initrd.
@@ -124,11 +124,35 @@
option may be specified more than once
in order to set up multiple
devices. rd.luks.uuid=
- is honoured only be initial RAM disk
+ is honored only by initial RAM disk
(initrd) while
luks.uuid= is
- honoured by both the main system and
- the initrd.
+ 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
+ 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.
+