Changeset 3595 in MondoRescue for branches

Timestamp:

Jul 6, 2016, 3:16:22 PM (9 years ago)

Author:

Bruno Cornec

Message:

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

File:

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

branches/3.2/mindi/mindi

@@ -440 +440 @@
         echo -e "$DONE"
         return 0
+    elif [ -e "/etc/default/keyboard" ]; then
+        LogFile "INFO: New Debian-style config detected."
+        keyfile=/etc/default/keyboard
     elif [ -e "/etc/rc.conf" ] ; then
         LogFile "INFO: ArchLinux config detected."
@@ -467 +470 @@
     locale=`grep -F KEYTABLE "$keyfile" | grep -v '^#' | tr -d '"' |cut -d'=' -f2 | sed 's/.map.gz$//'`
     [ ! "$locale" ] && locale=`grep '.map$' "$keyfile" | sed 's/^.* //'`        # Slackware
-    [ ! "$locale" ] && locale=`grep -E '^KEYMAP=' "$keyfile" | grep -v '^#' | tr -d '"' |cut -d'=' -f2`     # Gentoo, ArchLinux & New fedora
+    [ ! "$locale" ] && locale=`grep -E '^KEYMAP=' "$keyfile" | grep -v '^#' | tr -d '"' |cut -d'=' -f2`             # Gentoo, ArchLinux & New fedora
     [ ! "$locale" ] && locale=`grep -E 'XkbLayout' "$keyfile" | grep -v '^#' | awk '{print $3}' | tr -d '"'`        #  Fedora 19
+    [ ! "$locale" ] && locale=`grep -Ei 'XkbLayout' "$keyfile" | grep -v '^#' | cut -d= -f2 | tr -d '"'`            # New Debian 8+
     LogFile "INFO: locale=$locale"
     #