rpms/kexec-tools/devel kexec-tools.spec, 1.119, 1.120 mkdumprd, 1.23, 1.24

[Neil Horman]

Author: nhorman

Update of /cvs/extras/rpms/kexec-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18210

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


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- kexec-tools.spec	5 Aug 2008 17:12:18 -0000	1.119
+++ kexec-tools.spec	27 Aug 2008 11:24:36 -0000	1.120
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.102pre 
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -265,6 +265,9 @@
 
 
 %changelog
+* Web Aug 27 2008 Neil Horman <nhorman at redhat.com> - 1.102pre-16
+- Fix mkdumprd to properly use UUID/LABEL search (bz 455998)
+
 * Tue Aug  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.102pre-15
 - fix license tag
 


Index: mkdumprd
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/mkdumprd,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mkdumprd	14 Jul 2008 14:52:37 -0000	1.23
+++ mkdumprd	27 Aug 2008 11:24:37 -0000	1.24
@@ -383,13 +383,30 @@
         *)
             vg_list="$vg_list $vg"
             for device in `vgdisplay -v $vg 2>/dev/null | sed -n 's/PV Name//p'`; do
-                echo $device | sed -e's/\/dev\///' -e's/[0-9]\+//' >> $TMPDISKLIST 
+                IS_UUID=`echo $device | grep UUID`
+                IS_LABEL=`echo $device | grep UUID`
+                if [ -n "$IS_UUID" -o -n "$IS_LABEL" ]
+                then
+                    devname=`findfs $device`
+                else
+                    devmame=$device
+                fi
+                echo $devname | sed -e's/\/dev\///' -e's/[0-9]\+//' >> $TMPDISKLIST 
                 findstoragedriver ${device##/dev/}
             done
             ;;
         esac
     else
-        echo $1 | sed -e's/\/dev\///' -e's/[0-9]\+//' >> $TMPDISKLIST 
+        IS_UUID=`echo $1 | grep UUID`
+        IS_LABEL=`echo $1 | grep UUID`
+        if [ -n "$IS_UUID" -o -n "$IS_LABEL" ]
+        then
+            devname=`findfs $1`
+        else
+            devmame=$1
+        fi
+               
+        echo $devname | sed -e's/\/dev\///' -e's/[0-9]\+//' >> $TMPDISKLIST 
         findstoragedriver ${1##/dev/}
     fi
 }
@@ -748,18 +765,15 @@
                 rootdev=$dev
 	    fi
         fi
+    elif echo  $rootdev | cut -c1-6 | grep -q "UUID=" ; then
+        vecho "Found root device $dev for $rootdev"
+        rootdev=`/sbin/findfs $rootdev | sed -e's/\(.*\/\)\(.*$\)/\2/' -e's/[0-9]\+//'`
     else
     	rootopts=$(echo $rootopts | sed -e 's/^r[ow],//' -e 's/,r[ow],$//' -e 's/,r[ow],/,/' \
                      -e 's/^r[ow]$/defaults/' -e 's/$/,ro/')
     fi
     [ "$rootfs" != "nfs" ] && handlelvordev $rootdev
 
-    # find the first swap dev which would get used for swsusp
-    swsuspdev=$(awk '/^[ \t]*[^#]/ { if ($3 == "swap") { print $1; }}' $fstab \
-                | head -n 1)
-    if ! echo $swsuspdev | cut -c1-6 | grep -q "LABEL=" ; then
-        handlelvordev $swsuspdev
-    fi
 fi
 
 # If we use LVM or dm-based raid, include dm-mod