Changeset 3595 for branches


Ignore:
Timestamp:
Jul 6, 2016, 3:16:22 PM (3 years ago)
Author:
bruno
Message:

Fix #801 by adding support for the new kbd conf file for Debian 8.
Needs test with a foreign kbd

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.2/mindi/mindi

    r3590 r3595  
    440440        echo -e "$DONE"
    441441        return 0
     442    elif [ -e "/etc/default/keyboard" ]; then
     443        LogFile "INFO: New Debian-style config detected."
     444        keyfile=/etc/default/keyboard
    442445    elif [ -e "/etc/rc.conf" ] ; then
    443446        LogFile "INFO: ArchLinux config detected."
     
    467470    locale=`grep -F KEYTABLE "$keyfile" | grep -v '^#' | tr -d '"' |cut -d'=' -f2 | sed 's/.map.gz$//'`
    468471    [ ! "$locale" ] && locale=`grep '.map$' "$keyfile" | sed 's/^.* //'`        # Slackware
    469     [ ! "$locale" ] && locale=`grep -E '^KEYMAP=' "$keyfile" | grep -v '^#' | tr -d '"' |cut -d'=' -f2`     # Gentoo, ArchLinux & New fedora
     472    [ ! "$locale" ] && locale=`grep -E '^KEYMAP=' "$keyfile" | grep -v '^#' | tr -d '"' |cut -d'=' -f2`             # Gentoo, ArchLinux & New fedora
    470473    [ ! "$locale" ] && locale=`grep -E 'XkbLayout' "$keyfile" | grep -v '^#' | awk '{print $3}' | tr -d '"'`        #  Fedora 19
     474    [ ! "$locale" ] && locale=`grep -Ei 'XkbLayout' "$keyfile" | grep -v '^#' | cut -d= -f2 | tr -d '"'`            # New Debian 8+
    471475    LogFile "INFO: locale=$locale"
    472476    #
Note: See TracChangeset for help on using the changeset viewer.