Attachment 314309 Details for Bug 456001 – yet another corrected patch

[patch] yet another corrected patch

mkdumprd.patch (text/plain), 1.71 KB, created by Neil Horman on 2008-08-14 11:57:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neil Horman

Created: 2008-08-14 11:57:03 UTC

Size: 1.71 KB

patch

obsolete

>Index: mkdumprd
>===================================================================
>RCS file: /cvs/extras/rpms/kexec-tools/devel/mkdumprd,v
>retrieving revision 1.23
>diff -u -r1.23 mkdumprd
>--- mkdumprd	14 Jul 2008 14:52:37 -0000	1.23
>+++ mkdumprd	14 Aug 2008 11:55:08 -0000
>@@ -135,8 +135,7 @@
> }
> 
> findone() {
>-    echo nash-find "$@" | /sbin/nash --force --quiet \
>-	| /bin/awk '{ print $1; exit; }'
>+    find "$@" | /bin/awk '{ print $1; exit; }'
> }
> 
> findall() {
>@@ -269,6 +268,9 @@
>         [ "$PWD" = "/sys" ] && return
>         cd ..
>     done
>+
>+    IS_USB=`echo $1 | grep usb`
>+
>     cd $(readlink ./device)
>     while [ ! -f modalias ]; do
>         [ "$PWD" = "/sys/devices" ] && return
>@@ -278,6 +280,11 @@
>     for driver in $(modprobe --set-version $kernel --show-depends $modalias 2>/dev/null| awk '{ print gensub(".*/","","g",$2) }') ; do
>         findmodule ${driver%%.ko}
>     done
>+
>+    if [ -n "$IS_USB" ]
>+    then
>+        findmodule usb_storage
>+    if
> }
> 
> findstoragedriver () {
>@@ -293,11 +300,19 @@
>             continue
>         fi
>         vecho "Looking for driver for device $device"
>+        IS_LINK=""
>         device=`echo $device | sed 's/\//\!/g'`
>-        sysfs=$(findone -type d /sys/block -name $device)
>-        [ -z "$sysfs" ] && return
>+        sysfs=$(findone /sys/block -type d -name $device)
>+        if [ -z "$sysfs" ]
>+        then
>+            sysfs=$(findone /sys/block -type l -name $device)
>+            [ -z "$sysfs" ] && return
>+            IS_LINK=`readlink $sysfs`
>+        else
>+            IS_LINK=`readlink $sysfs/device`
>+        fi
>         pushd $sysfs >/dev/null 2>&1
>-        findstoragedriverinsys
>+        findstoragedriverinsys $IS_LINK
>         popd >/dev/null 2>&1
>     done
> }

Actions: View | Diff

Attachments on bug 456001: 312812 | 313889 | 313986 | 314013 | 314015 | 314121 | 314187 | 314309