Changeset 2828 in MondoRescue

Timestamp:

Jun 11, 2011, 7:18:52 AM (14 years ago)

Author:

Bruno Cornec

Message:

r4155@localhost: bruno | 2011-06-11 06:26:25 +0200

• Fix #481 by supporting the new kbd file in latest Ubuntu 10.10+ (victor.gattegno_at_hp.com)

File:

• branches/2.2.9/mindi/mindi (modified) (1 diff)

branches/2.2.9/mindi/mindi

@@ -365 +365 @@
         echo -e "$DONE"
         return 0
-    elif [ -e "/etc/console-setup/boottime.kmap.gz" ] ; then
+    elif [ -e "/etc/console-setup/boottime.kmap.gz" ] || [ -e "/etc/console-setup/cached.kmap.gz" ] ; then
         echo "Ubuntu-style config detected." >> $LOGFILE
         echo -en "Adding the following keyboard mapping tables: "
         mkdir -p $bigdir/tmp
-        echo "/etc/console-setup/boottime.kmap.gz" > $bigdir/tmp/KEYMAP-LIVES-HERE
+        if [ -e "/etc/console-setup/boottime.kmap.gz" ] ; then
+            kbdfile="/etc/console-setup/boottime.kmap.gz"
+        else
+            kbdfile="/etc/console-setup/cached.kmap.gz"
+        fi
+        echo $kbdfile > $bigdir/tmp/KEYMAP-LIVES-HERE
         KBDEPTH=0
         mkdir -p $bigdir/etc/console-setup
-        cp /etc/console-setup/boottime.kmap.gz $bigdir/etc/console-setup 2>> $LOGFILE
+        cp $kbdfile $bigdir/etc/console-setup 2>> $LOGFILE
         echo -e "$DONE"
         return 0