Changeset 1713 in MondoRescue for branches/2.2.5/mindi

Timestamp:

Oct 27, 2007, 8:31:17 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Improve Ubuntu/Debian keyboard detection and support
• pbinit adapted to new pb (0.8.10). Filtering of docs done in it
• Suppress some mondo warnings and errors on USB again

File:

• branches/2.2.5/mindi/mindi (modified) (2 diffs)

branches/2.2.5/mindi/mindi

@@ -516 +516 @@
     [ ! -e "$KEYDIR" ] && KEYDIR=/usr/lib/kbd
     [ ! -e "$KEYDIR" ] && KEYDIR=/usr/share
+    [ ! -e "$KEYDIR" ] && KEYDIR=/etc/condole
+    [ ! -e "$KEYDIR" ] && KEYDIR=/etc/condole-setup
     if [ ! -e "$KEYDIR" ] ; then
         LogIt "Keyboard mapping directory not found. I shall use default map at boot-time."
@@ -537 +539 @@
         mkdir -p $bigdir/etc/console
         cp /etc/console/boottime.kmap.gz $bigdir/etc/console 2>> $LOGFILE
+        echo -e "$DONE"
+        return 0
+    elif [ -e "/etc/console-setup/boottime.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
+        KBDEPTH=0
+        mkdir -p $bigdir/etc/console-setup
+        cp /etc/console-setup/boottime.kmap.gz $bigdir/etc/console-setup 2>> $LOGFILE
         echo -e "$DONE"
         return 0