Changeset 735 in MondoRescue

Timestamp:

Aug 3, 2006, 12:30:23 PM (18 years ago)

Author:

Bruno Cornec

Message:

Attempt to fix for Bug #8

File:

• branches/stable/mindi/mindi (modified) (5 diffs)

branches/stable/mindi/mindi

@@ -230 +230 @@
     [ "$KBDEPTH" -gt "128" ] && Die "Edit $MINDI_SBIN/mindi and disable FindAndAddUserKeyboardMappingFile (line 2160, approx.)"
     if [ -e "$bigdir/$mappath" ] ; then
-    echo "$mappath already added" >> $LOGFILE
-    return
+        echo "$mappath already added" >> $LOGFILE
+        return
     elif [ -d "$bigdir/$mappath" ] ; then
         echo "Cannot add $mappath: it's a directory. Sorry."
@@ -244 +244 @@
         fi
     else
-    echo -en "`basename $mappath | tr '.' '#' | sed s/#kmap#gz// | sed s/#inc#gz//` " | tr '#' '.'
+        echo -en "`basename $mappath | tr '.' '#' | sed s/#kmap#gz// | sed s/#inc#gz//` " | tr '#' '.'
     fi
 
@@ -555 +555 @@
     [ ! -e "$KEYDIR" ] && KEYDIR=/usr/share
     if [ ! -e "$KEYDIR" ] ; then
-    LogIt "Keyboard mapping directory not found. I shall use default map at boot-time.\n"
-    return 0
+        LogIt "Keyboard mapping directory not found. I shall use default map at boot-time.\n"
+        return 0
     fi
     if [ -e "/etc/sysconfig/keyboard" ] ; then
-    echo "Red Hat-style config detected." >> $LOGFILE
-    keyfile=/etc/sysconfig/keyboard
+        echo "Red Hat-style config detected." >> $LOGFILE
+        keyfile=/etc/sysconfig/keyboard
     elif [ -e "/etc/rc.d/rc.keymap" ] ; then
-    echo "Slackware-style config detected." >> $LOGFILE
-    keyfile=/etc/rc.d/rc.keymap
+        echo "Slackware-style config detected." >> $LOGFILE
+        keyfile=/etc/rc.d/rc.keymap
     elif [ -e "/etc/rc.config" ] ; then
         echo "Debian-style config detected." >> $LOGFILE
-    keyfile=/etc/rc.config
+        keyfile=/etc/rc.config
     elif [ -e "/etc/console/boottime.kmap.gz" ] ; then
         echo "Debian-style config detected." >> $LOGFILE
-    echo -en "Adding the following keyboard mapping tables: "
-    mkdir -p $bigdir/tmp
-    echo "/etc/console/boottime.kmap.gz" > $bigdir/tmp/KEYMAP-LIVES-HERE
-    KBDEPTH=0
-    mkdir -p $bigdir/etc/console
-    cp /etc/console/boottime.kmap.gz $bigdir/etc/console
-    echo -e "$DONE"
-    return 0
-    else
-    echo -en "Searching for rc.config ..."
-    keyfile=`find /etc -name rc.config | head -n1`
-    if [ "$keyfile" = "" ] || [ ! -e "$keyfile" ] ; then
-        LogIt "Unknown config detected. Default keyboard map will be used.\n"
-        return
-    else
-        echo "Found $keyfile" >> $LOGFILE
-    fi
+        echo -en "Adding the following keyboard mapping tables: "
+        mkdir -p $bigdir/tmp
+        echo "/etc/console/boottime.kmap.gz" > $bigdir/tmp/KEYMAP-LIVES-HERE
+        KBDEPTH=0
+        mkdir -p $bigdir/etc/console
+        cp /etc/console/boottime.kmap.gz $bigdir/etc/console
+        echo -e "$DONE"
+        return 0
+    else
+        echo -en "Searching for rc.config ..."
+        keyfile=`find /etc -name rc.config | head -n1`
+        if [ "$keyfile" = "" ] || [ ! -e "$keyfile" ] ; then
+            LogIt "Unknown config detected. Default keyboard map will be used.\n"
+            return
+        else
+            echo "Found $keyfile" >> $LOGFILE
+        fi
     fi
     if [ ! -e "$KEYDIR/keymaps" ] ; then
@@ -595 +595 @@
     [ ! "$locale" ] && locale=`grep '.map$' "$keyfile" | sed 's/^.* //'`        # Slackware
     echo "locale=$locale" >> $LOGFILE
-    mp=`find $KEYDIR/keymaps | grep "i[3-8]86" | grep -F "${locale}." | grep -vx " *#.*"`
+    mp=`find $KEYDIR/keymaps | grep "i[3-8]86" | grep -F "/${locale}." | grep -vx " *#.*"`
     [ ! "$mp" ] && mp=`find $KEYDIR/keymaps | grep "i[3-8]86" | grep "$locale[^r][^/]" | grep -vx " *#.*"`
+    # If we have multiple keymaps then log it !!
+    echo "$mp" | grep -q " "
+    if [ $? -eq 0 ]; then
+        echo "WARNING: Multiple keymaps found: $mp" | tee -a $LOGFILE
+        echo "The following one will be used" >> $LOGFILE
+    fi
     for i in $mp ; do
         mappath=$i
@@ -606 +612 @@
     echo "mappath = $mappath" >> $LOGFILE
     if [ ! -e "$mappath" ] || [ -d "$mappath" ] ; then
-    LogIt "Keyboard mapping file not found. Default keyboard map will be used.\n"
-    return
+        LogIt "Keyboard mapping file not found. Default keyboard map will be used.\n"
+        return
     fi
     echo -en "Adding the following keyboard mapping tables: "