[PATCH] dracut.8: updated I18N and LUKS sections

[PATCH] dracut.8: updated I18N and LUKS sections

[Amadeusz Żołnowski]

[-- Attachment #1: Type: text/plain, Size: 3597 bytes --]

i18n/README: typo corrected
---
 dracut.8                |   54 +++++++++++++++++++++++++++++++++--------------
 modules.d/10i18n/README |    2 +-
 2 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/dracut.8 b/dracut.8
index 10f1e1f..3a85cb5 100644
--- a/dracut.8
+++ b/dracut.8
@@ -167,28 +167,40 @@ set udev to loglevel info
 set udev to loglevel debug
 
 .SS I18N
- e.g.
-  LANG=en_US.UTF-8
-  SYSFONT=latarcyrheb-sun16
-  KEYTABLE=de-latin1-nodeadkeys
 .TP
-.BR KEYBOARDTYPE= sun|pc
-will be written to /etc/sysconfig/keyboard in the initramfs
+.BR KEYMAP "=<keymap base file name>"
+keyboard translation table loaded by loadkeys; taken from keymaps directory;
+will be written to /etc/sysconfig/keyboard in the initramfs, e.g.:
+KEYMAP=de-latin1-nodeadkeys
+.TP
+.BR EXT_KEYMAPS "=<list of keymap base file names>"
+list of extra keymaps to bo loaded (sep. by space); will be written to
+/etc/sysconfig/keyboard in the initramfs
+.TP
+.BR UNICODE =<1|0>
+boolean, indicating UTF-8 mode; will be written to /etc/sysconfig/i18n in the
+initramfs
 .TP
-.BR KEYTABLE= "<keytable filename>"
-will be written to /etc/sysconfig/keyboard in the initramfs
+.BR SYSFONT "=<font base file name>"
+console font; taken from consolefonts directory;  will be written to
+/etc/sysconfig/i18n in the initramfs; e.g.: SYSFONT=LatArCyrHeb-16
 .TP
-.BR SYSFONT= "Console font"
-will be written to /etc/sysconfig/i18n in the initramfs
+.BR CONTRANS "=<console map base file name>"
+see description of '-m' parameter in setfont manual; taken from consoletrans
+directory; will be written to /etc/sysconfig/i18n in the initramfs
 .TP
-.BR SYSFONTACM= "Unicode font map"
-will be written to /etc/sysconfig/i18n in the initramfs
+.BR UNIMAP "=<unicode table base file name>"
+see description of '-u' parameter in setfont manual; taken from unimaps
+directory; will be written to /etc/sysconfig/i18n in the initramfs
 .TP
-.BR UNIMAP= "Unicode font map"
-will be written to /etc/sysconfig/i18n in the initramfs
+.BR LANG "=<locale>"
+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.: LANG=pl_PL.utf8
 .TP
-.BR LANG= <locale>
-will be written to /etc/sysconfig/i18n in the initramfs
+.BR LC_ALL "=<locale>"
+taken from the environment; will be written to /etc/sysconfig/i18n in the
+initramfs
 
 .SS LVM
 .TP
@@ -221,6 +233,16 @@ This parameter can be specified multiple times.
 .BR rd_NO_CRYPTTAB
 do not check, if LUKS partition is in /etc/crypttab
 
+.SS "crypt LUKS - experimental removable keys support"
+works only when plymouth module is not included
+.TP
+.BR rd_LUKS_KEYPATH= "<path to keyfile>"
+path to keyfile inside remove device filesystem
+.TP
+.BR rd_LUKS_KEYDEV_UUID= "<rem. device uuid>"
+UUID of removalbe device storing keyfile; UUID doesn't have to be exact just
+like for rd_LUKS_UUID
+
 .SS MD
 .TP
 .BR rd_NO_MD
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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 198 bytes --]