Ticket #874: mindi_keyboard.patch

mindi

@@ -402 +402 @@
 FindAndAddUserKeyboardMappingFile() {
     local r res mapfile mappath included_item included_list keyfile mp locale
     LogAll "INFO: Analyzing your keyboard's configuration."
-    KEYDIR=/usr/lib/kbd
-    [ ! -e "$KEYDIR" ] && KEYDIR=/usr/share/kbd     # Slackware
+    KEYDIR=/usr/share/kbd       # Slackware
+    [ ! -e "$KEYDIR" ] && KEYDIR=/usr/lib/kbd
     [ ! -e "$KEYDIR" ] && KEYDIR=/etc/console
     [ ! -e "$KEYDIR" ] && KEYDIR=/etc/console-setup
     [ ! -e "$KEYDIR" ] && KEYDIR=/lib/kbd
@@ -413 +413 @@
     else
         LogFile "INFO: KEYDIR=$KEYDIR"
     fi
-    if [ -e "/etc/sysconfig/keyboard" ] ; then
-        LogFile "INFO: Red Hat-style config detected."
-        keyfile=/etc/sysconfig/keyboard
-    elif [ -e "/etc/vconsole.conf" ] ; then
+    if [ -e "/etc/vconsole.conf" ] ; then
         LogFile "INFO: New Fedora style config detected."
         keyfile=/etc/vconsole.conf
+    elif [ -e "/etc/sysconfig/keyboard" ] ; then
+        LogFile "INFO: Red Hat-style config detected."
+        keyfile=/etc/sysconfig/keyboard
     elif [ -e "/etc/rc.d/rc.keymap" ] ; then
         LogFile "INFO: Slackware-style config detected."
         keyfile=/etc/rc.d/rc.keymap