Ensure UNICODE keyboard layout is functional in emergency shell

/lib/udev/cosole_init will load either non-unicode or unicode versions
of keyboard layout for the same value of KEYMAP depending on language
setting. The simplest solution is to install both versions in initrd;
it does not take much space.

While on it, copy some additional maps to ensure emergency shell
has the same keyboard layout as full system.

Signed-off-by: Andrey Borzenkov <arvidjaar@mail.ru>
Signed-off-by: Luca Berra <bluca@vodka.it>

diff --git a/modules.d/10redhat-i18n/install b/modules.d/10redhat-i18n/install
index 92939a686aefe14c4a4fe686ba564ada05b35374..e7323a47f963b511265103cecd33ef7a9bd718d1 100755 (executable)
--- a/modules.d/10redhat-i18n/install
+++ b/modules.d/10redhat-i18n/install
@@ -27,12 +27,20 @@ install_local()
             KEYMAP=/etc/sysconfig/console/default.kmap
        else
             . /etc/sysconfig/keyboard
-            [[ $KEYTABLE && -d ${kbddir}/keymaps ]] && KEYMAP="$KEYTABLE.map"
+           if [[ $KEYTABLE && -d ${kbddir}/keymaps ]]; then
+               [[ $KEYTABLE =~ *.uni ]] && UNIKEYMAP="$KEYTABLE.map" \
+                   || UNIKEYMAP="$KEYTABLE.uni.map"
+               KEYMAP="$KEYTABLE.map"
+           fi
        fi
        if [[ $KEYMAP ]]; then
             [ -f /etc/sysconfig/keyboard ] && inst /etc/sysconfig/keyboard
             inst loadkeys
             findkeymap $KEYMAP
+            [[ $UNIKEYMAP ]] && findkeymap $UNIKEYMAP
+           [[ $GRP_TOGGLE ]] && findkeymap $GRP_TOGGLE.map
+           findkeymap delete.map
+           findkeymap backspace.map
 
             for FN in $KEYMAPS; do
                if [ -L $FN ]; then