X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-cryptsetup-generator.xml;h=c8753cef37dff7a88214fe98e25f9863750d2803;hb=68c913fd751f5c750e3c786b4ed512154b354599;hp=e2aa0428aac512ae0578d2ac950370e32f8a71eb;hpb=059b37cc288ab529c6b5033af1f8118914f0329f;p=elogind.git
diff --git a/man/systemd-cryptsetup-generator.xml b/man/systemd-cryptsetup-generator.xml
index e2aa0428a..c8753cef3 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
@@ -62,7 +62,7 @@
systemd-cryptsetup-generator
implements the generator
+ url="http://www.freedesktop.org/wiki/Software/systemd/Generators">generator
specification.
@@ -72,7 +72,7 @@
systemd-cryptsetup-generator understands
the following kernel command line parameters:
-
+
luks=
rd.luks=
@@ -80,12 +80,12 @@
Takes a boolean
argument. Defaults to
yes. If
- no disables the
+ 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.
@@ -97,17 +97,17 @@
Takes a boolean
argument. Defaults to
yes. If
- no causes the
+ no, causes the
generator to ignore any devices
configured in
/etc/crypttab
(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.
@@ -115,20 +115,92 @@
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
- /etc/fstab. This
+ /etc/crypttab. This
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 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=
+
+ 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 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 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
+ luks.key= is
+ honored by both the main system and
+ the initrd.
+