Attachment 312665 Details for Bug 455998 – patch to resolve uuid's in forgotten cases

[patch] patch to resolve uuid's in forgotten cases

mkdumprd.patch (text/plain), 2.28 KB, created by Neil Horman on 2008-07-25 18:35:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neil Horman

Created: 2008-07-25 18:35:33 UTC

Size: 2.28 KB

patch

obsolete

>? 1
>? kexec-tools-testing-20070330
>Index: mkdumprd
>===================================================================
>RCS file: /cvs/dist/rpms/kexec-tools/RHEL-5/mkdumprd,v
>retrieving revision 1.80
>diff -u -r1.80 mkdumprd
>--- mkdumprd	23 Jul 2008 13:19:07 -0000	1.80
>+++ mkdumprd	25 Jul 2008 18:30:54 -0000
>@@ -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
> }
>@@ -760,18 +777,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'$.*\/$$.*$$' -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

Actions: View | Diff

Attachments on bug 455998: 312217 | 312665 | 312792 | 314615