rpms/kexec-tools/F-13 kexec-tools.spec, 1.160, 1.161 mkdumprd, 1.31, 1.32

[Neil Horman]

Author: nhorman

Update of /cvs/pkgs/rpms/kexec-tools/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22164

Modified Files:
	kexec-tools.spec mkdumprd 
Log Message:
Resolves: bz 590923


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kexec-tools/F-13/kexec-tools.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -p -r1.160 -r1.161
--- kexec-tools.spec	30 Apr 2010 19:17:13 -0000	1.160
+++ kexec-tools.spec	12 May 2010 19:56:21 -0000	1.161
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.0 
-Release: 34%{?dist}
+Release: 35%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -269,6 +269,9 @@ done
 
 
 %changelog
+* Wed May 12 2010 Neil Horman <nhorman at redhat.com> - 2.0.0-35
+- Fixed readlink bug in mkdumprd (bz 590923)
+
 * Fri Apr 30 2010 Neil Horman <nhorman at redhat.com> - 2.0.0-34
 - Fixed kernel text area search in kcore (bz 587750)
 


Index: mkdumprd
===================================================================
RCS file: /cvs/pkgs/rpms/kexec-tools/F-13/mkdumprd,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- mkdumprd	11 Mar 2010 16:18:34 -0000	1.31
+++ mkdumprd	12 May 2010 19:56:21 -0000	1.32
@@ -258,10 +258,6 @@ inst() {
     cp $1 $2
 }
 
-readlink() {
-    readlink "$1"
-}
-
 
 findstoragedriverinsys () {
     while [ ! -L device ]; do
@@ -293,7 +289,9 @@ findstoragedriver () {
         fi
         vecho "Looking for driver for device $device"
         device=`echo $device | sed 's/\//\!/g'`
-        pushd $(readlink /sys/class/block/$device ) >/dev/null 2>&1 || return
+        sysfs=$(findone -L /sys/block -maxdepth 2 -type d -name $device)
+        [ -z "$sysfs" ] && return
+        pushd $sysfs >/dev/null 2>&1
         findstoragedriverinsys
         popd >/dev/null 2>&1
     done