Changeset 3187 in MondoRescue for branches/3.0/mindi/mindi

Timestamp:

Sep 25, 2013, 8:55:37 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Fix keyboard support on Fedora 19 (no conf file found so used the X11 one)
• Fix kernel detection on 3.9+ where the message was lacking <> around the 6

File:

• branches/3.0/mindi/mindi (modified) (5 diffs)

branches/3.0/mindi/mindi

@@ -376 +376 @@
     [ ! -e "$KEYDIR" ] && KEYDIR=/usr/share/kbd     # Slackware
     [ ! -e "$KEYDIR" ] && KEYDIR=/usr/lib/kbd
+    [ ! -e "$KEYDIR" ] && KEYDIR=/lib/kbd
     [ ! -e "$KEYDIR" ] && KEYDIR=/usr/share
     [ ! -e "$KEYDIR" ] && KEYDIR=/etc/condole
@@ -423 +424 @@
         LogFile "INFO: Gentoo-style config detected."
         keyfile=/etc/conf.d/keymaps
+    elif [ -e "/etc/X11/xorg.conf.d/00-keyboard.conf" ] ; then
+        LogFile "INFO: X11-style config detected."
+        keyfile=/etc/X11/xorg.conf.d/00-keyboard.conf
     else
         LogFile "Searching for rc.config ..."
@@ -442 +446 @@
     [ ! "$locale" ] && locale=`grep '.map$' "$keyfile" | sed 's/^.* //'`        # Slackware
     [ ! "$locale" ] && locale=`grep -E '^KEYMAP=' "$keyfile" | grep -v '^#' | tr -d '"' |cut -d'=' -f2`     # Gentoo & ArchLinux
+    [ ! "$locale" ] && locale=`grep -E 'XkbLayout' "$keyfile" | grep -v '^#' | awk '{print $3}' | tr -d '"'`        #  Fedora 19
     LogFile "INFO: locale=$locale"
     #
@@ -707 +712 @@
     local lcMagicExt2fs="EXT2-fs: blocksize too small for device."
     local lcMagicExt3fs="<3>EXT3-fs: blocksize too small for journal device."
-    local lcMagicInitfs="<6>checking if image is initramfs...|<6>Unpacking initramfs...|<6>Trying to unpack rootfs image as initramfs"
+    local lcMagicInitfs="<6>checking if image is initramfs...|[<]6[>]Unpacking initramfs...|<6>Trying to unpack rootfs image as initramfs"
 
     # local variables
@@ -2351 +2356 @@
         if [ "$?" -eq "0" ] ; then
             # Used by ia64
-            fkern_ver=`gzip -cd $fname | strings 2> /dev/null | grep -E '[2-9]+[.][0-9]+[.][0-9]+[^\@]*@'`
+            fkern_ver=`gzip -cd $fname | strings 2> /dev/null | grep "[2-9]+*[.][0-9]+*[.][0-9]+*[^\@]*@"`
         else
-            fkern_ver=`strings $fname 2> /dev/null | grep -E '[2-9]+[.][0-9]+[.][0-9]+[^\@]*@'`
+            fkern_ver=`strings $fname 2> /dev/null | grep "[2-9]+*[.][0-9]+*[.][0-9]+*[^\@]*@"`
         fi
         echo "$fkern_ver"