X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-cryptsetup-generator.xml;h=3abb39d550b44f4bd72daf5cdd84f8c58714a95d;hb=63b03c0b2889dd490b3511f12f00268c154a655c;hp=c5f8d2a9d8ea0dec8909f8469dd383e575269fef;hpb=ccc9a4f9ffdab069b0b785627c48962fdadf6d46;p=elogind.git
diff --git a/man/systemd-cryptsetup-generator.xml b/man/systemd-cryptsetup-generator.xml
index c5f8d2a9d..3abb39d55 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
@@ -80,7 +80,7 @@
Takes a boolean
argument. Defaults to
yes. If
- no disables the
+ no, disables the
generator
entirely. rd.luks=
is honored only by initial RAM disk
@@ -97,7 +97,7 @@
Takes a boolean
argument. Defaults to
yes. If
- no causes the
+ no, causes the
generator to ignore any devices
configured in
/etc/crypttab
@@ -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
@@ -128,7 +128,54 @@
(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.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=
+
+ 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.
+