Changeset 3187


Ignore:
Timestamp:
Sep 25, 2013, 8:55:37 AM (6 years ago)
Author:
bruno
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:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.0/mindi/mindi

    r3184 r3187  
    376376    [ ! -e "$KEYDIR" ] && KEYDIR=/usr/share/kbd     # Slackware
    377377    [ ! -e "$KEYDIR" ] && KEYDIR=/usr/lib/kbd
     378    [ ! -e "$KEYDIR" ] && KEYDIR=/lib/kbd
    378379    [ ! -e "$KEYDIR" ] && KEYDIR=/usr/share
    379380    [ ! -e "$KEYDIR" ] && KEYDIR=/etc/condole
     
    423424        LogFile "INFO: Gentoo-style config detected."
    424425        keyfile=/etc/conf.d/keymaps
     426    elif [ -e "/etc/X11/xorg.conf.d/00-keyboard.conf" ] ; then
     427        LogFile "INFO: X11-style config detected."
     428        keyfile=/etc/X11/xorg.conf.d/00-keyboard.conf
    425429    else
    426430        LogFile "Searching for rc.config ..."
     
    442446    [ ! "$locale" ] && locale=`grep '.map$' "$keyfile" | sed 's/^.* //'`        # Slackware
    443447    [ ! "$locale" ] && locale=`grep -E '^KEYMAP=' "$keyfile" | grep -v '^#' | tr -d '"' |cut -d'=' -f2`     # Gentoo & ArchLinux
     448    [ ! "$locale" ] && locale=`grep -E 'XkbLayout' "$keyfile" | grep -v '^#' | awk '{print $3}' | tr -d '"'`        #  Fedora 19
    444449    LogFile "INFO: locale=$locale"
    445450    #
     
    707712    local lcMagicExt2fs="EXT2-fs: blocksize too small for device."
    708713    local lcMagicExt3fs="<3>EXT3-fs: blocksize too small for journal device."
    709     local lcMagicInitfs="<6>checking if image is initramfs...|<6>Unpacking initramfs...|<6>Trying to unpack rootfs image as initramfs"
     714    local lcMagicInitfs="<6>checking if image is initramfs...|[<]6[>]Unpacking initramfs...|<6>Trying to unpack rootfs image as initramfs"
    710715
    711716    # local variables
     
    23512356        if [ "$?" -eq "0" ] ; then
    23522357            # Used by ia64
    2353             fkern_ver=`gzip -cd $fname | strings 2> /dev/null | grep -E '[2-9]+[.][0-9]+[.][0-9]+[^\@]*@'`
     2358            fkern_ver=`gzip -cd $fname | strings 2> /dev/null | grep "[2-9]+*[.][0-9]+*[.][0-9]+*[^\@]*@"`
    23542359        else
    2355             fkern_ver=`strings $fname 2> /dev/null | grep -E '[2-9]+[.][0-9]+[.][0-9]+[^\@]*@'`
     2360            fkern_ver=`strings $fname 2> /dev/null | grep "[2-9]+*[.][0-9]+*[.][0-9]+*[^\@]*@"`
    23562361        fi
    23572362        echo "$fkern_ver"
Note: See TracChangeset for help on using the changeset viewer.