Re: [PATCH] Do full console initialization in the initrd, not just keymap. (#458362)

[Hans de Goede <hdegoede redhat com>]

Bill Nottingham wrote:
> Hans de Goede (hdegoede redhat com) said: 
> > Other then the remarks above it looks ok.
>
> Updated diff attached.

diff --git a/mkinitrd b/mkinitrd
index cbf5978..8f49ae9 100755
--- a/mkinitrd
+++ b/mkinitrd
@@ -1535,29 +1535,20 @@ EOF

 if [ $ncryptodevs -ne 0 ]; then
     inst /sbin/cryptsetup "$MNTIMAGE"
+fi

-    KEYTABLE=
-    KEYMAP=
+if [ -f /etc/sysconfig/keyboard ] || [ -f /etc/sysconfig/console/default.kmap 
]; then
+    I18N=yes
     if [ -f /etc/sysconfig/console/default.kmap ]; then
         KEYMAP=/etc/sysconfig/console/default.kmap
     else
-        if [ -f /etc/sysconfig/keyboard ]; then
-            . /etc/sysconfig/keyboard
-        fi
+        [ -f /etc/sysconfig/keyboard ] && . /etc/sysconfig/keyboard

There is no need for the test here, you are in a
"if [ -f /etc/sysconfig/keyboard ] || [ -f /etc/sysconfig/console/default.kmap];"
block here, so if /etc/sysconfig/console/default.kmap does not exist then 
/etc/sysconfig/keyboard must exist.

Other then that it looks fine.

Regards,

Hans