You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see <http://www.gnu.org/licenses/>.
-->
-<refentry id="systemd-cryptsetup-generator">
+<refentry id="systemd-cryptsetup-generator" conditional='HAVE_LIBCRYPTSETUP'>
<refentryinfo>
<title>systemd-cryptsetup-generator</title>
<para><filename>systemd-cryptsetup-generator</filename>
implements the <ulink
- url="http://www.freedesktop.org/wiki/Software/systemd/Generator">generator
+ url="http://www.freedesktop.org/wiki/Software/systemd/Generators">generator
specification</ulink>.</para>
</refsect1>
<para><filename>systemd-cryptsetup-generator</filename> understands
the following kernel command line parameters:</para>
- <variablelist>
+ <variablelist class='kernel-commandline-options'>
<varlistentry>
<term><varname>luks=</varname></term>
<term><varname>rd.luks=</varname></term>
<literal>no</literal> disables the
generator
entirely. <varname>rd.luks=</varname>
- is honoured only be initial RAM disk
+ is honored only by initial RAM disk
(initrd) while
- <varname>luks=</varname> is honoured
+ <varname>luks=</varname> is honored
by both the main system and the
initrd. </para></listitem>
</varlistentry>
(<varname>luks.uuid=</varname> will
still work
however). <varname>rd.luks.crypttab=</varname>
- is honoured only be initial RAM disk
+ is honored only by initial RAM disk
(initrd) while
<varname>luks.crypttab=</varname> is
- honoured by both the main system and
+ honored by both the main system and
the initrd. </para></listitem>
</varlistentry>
option may be specified more than once
in order to set up multiple
devices. <varname>rd.luks.uuid=</varname>
- is honoured only be initial RAM disk
+ is honored only by initial RAM disk
(initrd) while
<varname>luks.uuid=</varname> is
- honoured by both the main system and
- the initrd.</para></listitem>
+ honored by both the main system and
+ the initrd.</para>
+ <para>If /etc/crypttab contains entries with
+ the same UUID, then the options for this entry
+ will be used.</para>
+ <para>If /etc/crypttab exists, only those UUID
+ specified on the kernel command line
+ will be activated in the initrd or the real root.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><varname>luks.key=</varname></term>
+ <term><varname>rd.luks.key=</varname></term>
+
+ <listitem><para>Takes a password file as argument.</para>
+ <para>For those entries specified with
+ <varname>rd.luks.uuid=</varname> or <varname>luks.uuid=</varname>,
+ the password file will be set to the password file specified by
+ <varname>rd.luks.key=</varname> or <varname>luks.key</varname></para>
+ <para><varname>rd.luks.key=</varname>
+ is honored only by initial RAM disk
+ (initrd) while
+ <varname>luks.key=</varname> is
+ honored by both the main system and
+ the initrd.</para>
+ </listitem>
</varlistentry>
</variablelist>
</refsect1>