10i18n/README: typo corrected --- dracut.kernel.7.xml | 81 ++++++++++++++++++++++++++++++++++------------ modules.d/10i18n/README | 2 +- 2 files changed, 61 insertions(+), 22 deletions(-)
diff --git a/dracut.kernel.7.xml b/dracut.kernel.7.xml
index e55d8cc..69925a2 100644
--- 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><keymap base file name></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><keytable
filename></replaceable></envar>
+ <envar>EXT_KEYMAPS=</envar>
+ <replaceable><list of keymap base file names></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><Console
font></replaceable></envar>
+ <envar>UNICODE=</envar>
+ <replaceable><1|0></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><Console map></replaceable>
+ <envar>SYSFONT=</envar>
+ <replaceable><font base file name></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><Unicode font
map></replaceable></envar>
+ <envar>CONTRANS=</envar>
+ <replaceable><console map base file name></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><locale></replaceable></envar>
+ <envar>UNIMAP=</envar>
+ <replaceable><unicode table base file name></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><locale></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><locale></replaceable>
+ </term>
+ <listitem>
+ <para>taken from the environment; will be written to
/etc/sysconfig/i18n in the initramfs</para>
</listitem>
</varlistentry>
</variablelist>
@@ -301,6 +316,30 @@ This parameter can be specified multiple times.</para>
</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><path to keyfile></replaceable>
+ </term>
+ <listitem>
+ <para>path to keyfile inside remove device filesystem</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <envar>rd_LUKS_KEYDEV_UUID=</envar>
+ <replaceable><rem. device uuid></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>
<varlistentry>
diff --git a/modules.d/10i18n/README b/modules.d/10i18n/README
index 09cb642..c1878a7 100644
--- 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.
--
1.7.2
signature.asc
Description: PGP signature
