diff -p -up mkinitrd-6.0.62/functions.gz-modules mkinitrd-6.0.62/functions --- mkinitrd-6.0.62/functions.gz-modules 2008-08-11 18:14:54.000000000 +0200 +++ mkinitrd-6.0.62/functions 2008-08-19 16:45:47.000000000 +0200 @@ -238,7 +238,7 @@ moduledep() { fi vecho -n "Looking for deps of module $1" deps="" - deps=$(modprobe $MPARGS --set-version $kernel --show-depends $1 2>/dev/null| awk '/^insmod / { print gensub(".*/","","g",$2) }' | while read foo ; do [ "${foo%%.ko}" != "$1" ] && echo -n "${foo%%.ko} " ; done) + deps=$(modprobe $MPARGS --set-version $kernel --show-depends $1 2>/dev/null| awk '/^insmod / { print gensub(".*/","","g",$2) }' | while read foo ; do [ "${foo%%.ko*}" != "$1" ] && echo -n "${foo%%.ko*} " ; done) [ -n "$deps" ] && vecho ": $deps" || vecho } @@ -252,7 +252,7 @@ locatemodule() { if [ -n "$fmPath" -a -f "$fmPath" ]; then return 0 fi - for modExt in o.gz o ko ; do + for modExt in ko.gz o.gz o ko ; do for modDir in /lib/modules/$kernel/updates /lib/modules/$kernel ; do if [ -d $modDir ]; then fmPath=$(findone $modDir -name $1.$modExt) @@ -273,9 +273,9 @@ expandModules() { if [ $char = '=' ]; then NAME=$(echo $m | cut -c2-) if [ "$NAME" = "ata" ]; then - MODS="$MODS $(cat /lib/modules/$kernel/modules.block |egrep '(ata|ahci)' |sed -e 's/.ko//')" + MODS="$MODS $(cat /lib/modules/$kernel/modules.block |egrep '(ata|ahci)' |sed -e 's/.ko(.gz)?//')" else - MODS="$MODS $(cat /lib/modules/$kernel/modules.$NAME |sed -e 's/.ko//')" + MODS="$MODS $(cat /lib/modules/$kernel/modules.$NAME |sed -e 's/.ko(.gz)?//')" fi else MODS="$MODS $m" @@ -298,7 +298,7 @@ installmodule() if [ -z "$MODULE" ]; then return fi - if [ -x /usr/bin/strip ]; then + if ! [[ $MODULE =~ \.gz ]] && [ -x /usr/bin/strip ]; then /usr/bin/strip -g $(get_verbose) $MODULE -o $MNTIMAGE/lib/modules/$kernel/$(basename $MODULE) else inst "$MODULE" "$MNTIMAGE" "/lib/modules/$kernel/$(basename $MODULE)" diff -p -up mkinitrd-6.0.62/mkinitrd.gz-modules mkinitrd-6.0.62/mkinitrd --- mkinitrd-6.0.62/mkinitrd.gz-modules 2008-08-19 16:31:02.000000000 +0200 +++ mkinitrd-6.0.62/mkinitrd 2008-08-19 16:31:02.000000000 +0200 @@ -186,6 +186,7 @@ findmodule() { case "$(eval echo \${$modlist}) " in *"/$modName.ko "*) return ;; + *"/$modName.ko.gz "*) return ;; esac if echo $builtins | egrep -q '(^| )'$modName'( |$)' ; then