diff options
Diffstat (limited to 'man/systemd-cryptsetup-generator.xml')
-rw-r--r-- | man/systemd-cryptsetup-generator.xml | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/man/systemd-cryptsetup-generator.xml b/man/systemd-cryptsetup-generator.xml index 49d4d5545b..7950032941 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 <http://www.gnu.org/licenses/>. --> -<refentry id="systemd-cryptsetup-generator"> +<refentry id="systemd-cryptsetup-generator" conditional='HAVE_LIBCRYPTSETUP'> <refentryinfo> <title>systemd-cryptsetup-generator</title> @@ -72,7 +72,7 @@ <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> @@ -128,7 +128,31 @@ (initrd) while <varname>luks.uuid=</varname> is honored by both the main system and - the initrd.</para></listitem> + 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> |