summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmadeusz Żołnowski <aidecoe@aidecoe.name>2010-08-06 13:14:18 +0200
committerHarald Hoyer <harald@redhat.com>2010-08-06 13:36:13 +0200
commit9b3d462b685e763e5b0df12779a59bcf19b67658 (patch)
tree57424740da7cb02e73de1d8c20a0a07f1f15b741
parent5150d44a7ebd85d7226e1e6fd297b232a982a151 (diff)
downloaddracut-9b3d462b685e763e5b0df12779a59bcf19b67658.tar.gz
dracut-9b3d462b685e763e5b0df12779a59bcf19b67658.tar.bz2
dracut-9b3d462b685e763e5b0df12779a59bcf19b67658.zip
dracut.kernel.7.xml: updated I18N and LUKS sections
10i18n/README: typo corrected
-rw-r--r--dracut.kernel.7.xml81
-rw-r--r--modules.d/10i18n/README2
2 files changed, 61 insertions, 22 deletions
diff --git a/dracut.kernel.7.xml b/dracut.kernel.7.xml
index e55d8ccb..69925a25 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>&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>
@@ -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>&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>
<varlistentry>
diff --git a/modules.d/10i18n/README b/modules.d/10i18n/README
index 09cb6421..c1878a7e 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.