Changeset 2828


Ignore:
Timestamp:
Jun 11, 2011, 7:18:52 AM (8 years ago)
Author:
bruno
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:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.9/mindi/mindi

    r2773 r2828  
    365365        echo -e "$DONE"
    366366        return 0
    367     elif [ -e "/etc/console-setup/boottime.kmap.gz" ] ; then
     367    elif [ -e "/etc/console-setup/boottime.kmap.gz" ] || [ -e "/etc/console-setup/cached.kmap.gz" ] ; then
    368368        echo "Ubuntu-style config detected." >> $LOGFILE
    369369        echo -en "Adding the following keyboard mapping tables: "
    370370        mkdir -p $bigdir/tmp
    371         echo "/etc/console-setup/boottime.kmap.gz" > $bigdir/tmp/KEYMAP-LIVES-HERE
     371        if [ -e "/etc/console-setup/boottime.kmap.gz" ] ; then
     372            kbdfile="/etc/console-setup/boottime.kmap.gz"
     373        else
     374            kbdfile="/etc/console-setup/cached.kmap.gz"
     375        fi
     376        echo $kbdfile > $bigdir/tmp/KEYMAP-LIVES-HERE
    372377        KBDEPTH=0
    373378        mkdir -p $bigdir/etc/console-setup
    374         cp /etc/console-setup/boottime.kmap.gz $bigdir/etc/console-setup 2>> $LOGFILE
     379        cp $kbdfile $bigdir/etc/console-setup 2>> $LOGFILE
    375380        echo -e "$DONE"
    376381        return 0
Note: See TracChangeset for help on using the changeset viewer.