dracut.kernel.7.xml: updated I18N and LUKS sections

10i18n/README: typo corrected

diff --git a/dracut.kernel.7.xml b/dracut.kernel.7.xml
index e55d8ccbef41193f8e738e9c4f50e4f68c1a1ce9..69925a25a8e1fed3cb426a9b8be373620c206057 100644 (file)
--- a/dracut.kernel.7.xml
+++ b/dracut.kernel.7.xml
@@ -168,62 +168,77 @@ This parameter can be specified multiple times.</para>
     </refsect2>
     <refsect2>
       <title>I18N</title>
-      <para> e.g.
-      <programlisting>
-LANG=en_US.UTF-8
-SYSFONT=latarcyrheb-sun16
-KEYTABLE=de-latin1-nodeadkeys
-      </programlisting>
-      </para>
       <variablelist>
         <varlistentry>
           <term>
-            <envar>KEYBOARDTYPE=</envar>
-            <replaceable>{sun|pc}</replaceable>
+            <envar>KEYMAP=</envar>
+            <replaceable>&lt;keymap base file name&gt;</replaceable>
           </term>
           <listitem>
-            <para>will be written to /etc/sysconfig/keyboard in the initramfs</para>
+            <para>keyboard translation table loaded by loadkeys; taken from keymaps directory; will be written to /etc/sysconfig/keyboard in the initramfs, e.g.: <programlisting>KEYMAP=de-latin1-nodeadkeys</programlisting></para>
           </listitem>
         </varlistentry>
         <varlistentry>
           <term>
-            <envar>KEYTABLE=<replaceable>&lt;keytable filename&gt;</replaceable></envar>
+            <envar>EXT_KEYMAPS=</envar>
+            <replaceable>&lt;list of keymap base file names&gt;</replaceable>
           </term>
           <listitem>
-            <para>will be written to /etc/sysconfig/keyboard in the initramfs</para>
+            <para>list of extra keymaps to bo loaded (sep. by space); will be written to /etc/sysconfig/keyboard in the initramfs</para>
           </listitem>
         </varlistentry>
         <varlistentry>
           <term>
-            <envar>SYSFONT=<replaceable>&lt;Console font&gt;</replaceable></envar>
+            <envar>UNICODE=</envar>
+            <replaceable>&lt;1|0&gt;</replaceable>
           </term>
           <listitem>
-            <para>will be written to /etc/sysconfig/i18n in the initramfs</para>
+            <para>boolean, indicating UTF-8 mode; will be written to /etc/sysconfig/i18n in the initramfs</para>
           </listitem>
         </varlistentry>
         <varlistentry>
           <term>
-            <envar>SYSFONTACM=</envar>
-            <replaceable>&lt;Console map&gt;</replaceable>
+            <envar>SYSFONT=</envar>
+            <replaceable>&lt;font base file name&gt;</replaceable>
           </term>
           <listitem>
-            <para>will be written to /etc/sysconfig/i18n in the initramfs</para>
+            <para>console font; taken from consolefonts directory;  will be written to /etc/sysconfig/i18n in the initramfs; e.g.: <programlisting>SYSFONT=LatArCyrHeb-16</programlisting></para>
           </listitem>
         </varlistentry>
         <varlistentry>
           <term>
-            <envar>UNIMAP=<replaceable>&lt;Unicode font map&gt;</replaceable></envar>
+            <envar>CONTRANS=</envar>
+            <replaceable>&lt;console map base file name&gt;</replaceable>
           </term>
           <listitem>
-            <para>will be written to /etc/sysconfig/i18n in the initramfs</para>
+            <para>see description of '-m' parameter in setfont manual; taken from consoletrans directory; will be written to /etc/sysconfig/i18n in the initramfs</para>
           </listitem>
         </varlistentry>
         <varlistentry>
           <term>
-            <envar>LANG=<replaceable>&lt;locale&gt;</replaceable></envar>
+            <envar>UNIMAP=</envar>
+            <replaceable>&lt;unicode table base file name&gt;</replaceable>
           </term>
           <listitem>
-            <para>will be written to /etc/sysconfig/i18n in the initramfs</para>
+            <para>see description of '-u' parameter in setfont manual; taken from unimaps directory; will be written to /etc/sysconfig/i18n in the initramfs</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>LANG=</envar>
+            <replaceable>&lt;locale&gt;</replaceable>
+          </term>
+          <listitem>
+            <para>taken from the environment; if no UNICODE is defined we set its value in basis of LANG value (whether it ends with ".utf8" (or similar) or not); will be written to /etc/sysconfig/i18n in the initramfs; e.g.: <programlisting>LANG=pl_PL.utf8</programlisting></para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>LC_ALL=</envar>
+            <replaceable>&lt;locale&gt;</replaceable>
+          </term>
+          <listitem>
+            <para>taken from the environment; will be written to /etc/sysconfig/i18n in the initramfs</para>
           </listitem>
         </varlistentry>
       </variablelist>
@@ -300,6 +315,30 @@ This parameter can be specified multiple times.</para>
         </varlistentry>
       </variablelist>
     </refsect2>
+    <refsect2>
+      <title>crypt LUKS - experimental removable keys support</title>
+      <para>works only when plymouth module is not included</para>
+      <variablelist>
+        <varlistentry>
+          <term>
+            <envar>rd_LUKS_KEYPATH=</envar>
+            <replaceable>&lt;path to keyfile&gt;</replaceable>
+          </term>
+          <listitem>
+            <para>path to keyfile inside remove device filesystem</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>rd_LUKS_KEYDEV_UUID=</envar>
+            <replaceable>&lt;rem. device uuid&gt;</replaceable>
+          </term>
+          <listitem>
+            <para>UUID of removalbe device storing keyfile; UUID doesn't have to be exact just like for rd_LUKS_UUID</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
     <refsect2>
       <title>MD</title>
       <variablelist>

diff --git a/modules.d/10i18n/README b/modules.d/10i18n/README
index 09cb642149d4286c5f0e578003588c1fabe0400a..c1878a7eab11fd6b9deb9e78c7cda3fea0c9cbfd 100644 (file)
--- a/modules.d/10i18n/README
+++ b/modules.d/10i18n/README
@@ -120,5 +120,5 @@ file (the same where you put mappings).
 3. Kernel parameters
 
 If you create generic initramfs you can set up i18n by kernel
-parameters using variables listed in 2.1. (expect of UNIKEYMAP
+parameters using variables listed in 2.1. (except of UNIKEYMAP
 and GRP_TOGGLE) The recommended minimum is: SYSFONT, KEYMAP and UNICODE.