X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-cryptsetup-generator.xml;h=3abb39d550b44f4bd72daf5cdd84f8c58714a95d;hb=05b92756f74943a3d8c3ad13f5688c7dd22bd9ab;hp=dfe55c7251565be712992667110b4cac923b85c3;hpb=f220d83cbc63678c765dd0b80983f17b1d5e615b;p=elogind.git
diff --git a/man/systemd-cryptsetup-generator.xml b/man/systemd-cryptsetup-generator.xml
index dfe55c725..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
@@ -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,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
@@ -124,11 +124,58 @@
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.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.
+
@@ -139,7 +186,8 @@
systemd1,
crypttab5,
systemd-cryptsetup@.service8,
- cryptsetup8
+ cryptsetup8,
+ systemd-fstab-generator8