Changeset 3187 in MondoRescue for branches/3.0
- Timestamp:
- Sep 25, 2013, 8:55:37 AM (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.0/mindi/mindi
r3184 r3187 376 376 [ ! -e "$KEYDIR" ] && KEYDIR=/usr/share/kbd # Slackware 377 377 [ ! -e "$KEYDIR" ] && KEYDIR=/usr/lib/kbd 378 [ ! -e "$KEYDIR" ] && KEYDIR=/lib/kbd 378 379 [ ! -e "$KEYDIR" ] && KEYDIR=/usr/share 379 380 [ ! -e "$KEYDIR" ] && KEYDIR=/etc/condole … … 423 424 LogFile "INFO: Gentoo-style config detected." 424 425 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 425 429 else 426 430 LogFile "Searching for rc.config ..." … … 442 446 [ ! "$locale" ] && locale=`grep '.map$' "$keyfile" | sed 's/^.* //'` # Slackware 443 447 [ ! "$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 444 449 LogFile "INFO: locale=$locale" 445 450 # … … 707 712 local lcMagicExt2fs="EXT2-fs: blocksize too small for device." 708 713 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" 710 715 711 716 # local variables … … 2351 2356 if [ "$?" -eq "0" ] ; then 2352 2357 # 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]+*[^\@]*@"` 2354 2359 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]+*[^\@]*@"` 2356 2361 fi 2357 2362 echo "$fkern_ver"
Note:
See TracChangeset
for help on using the changeset viewer.