Attachment 305717 Details for Bug 446279 – patch to provide initramfs with list of critical block devices

[patch] patch to provide initramfs with list of critical block devices

mkdumprd.patch (text/plain), 3.14 KB, created by Neil Horman on 2008-05-16 17:26:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neil Horman

Created: 2008-05-16 17:26:52 UTC

Size: 3.14 KB

patch

obsolete

>? kexec-tools-1.101
>? kexec-tools-1.102pre-1.el5.src.rpm
>? kexec-tools-testing-20070330
>Index: mkdumprd
>===================================================================
>RCS file: /cvs/dist/rpms/kexec-tools/RHEL-5/mkdumprd,v
>retrieving revision 1.71
>diff -u -r1.71 mkdumprd
>--- mkdumprd	7 Apr 2008 11:28:56 -0000	1.71
>+++ mkdumprd	16 May 2008 17:17:14 -0000
>@@ -73,6 +73,8 @@
> KDUMP_POST=""
> extra_kdump_mods=""
> 
>+TMPDISKLIST=`mktemp /tmp/disklist.XXXXXX`
>+
> vecho()
> {
>     NONL=""
>@@ -381,11 +383,13 @@
>         *)
>             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 
>                 findstoragedriver ${device##/dev/}
>             done
>             ;;
>         esac
>     else
>+        echo $1 | sed -e's/\/dev\///' -e's/[0-9]\+//' >> $TMPDISKLIST 
>         findstoragedriver ${1##/dev/}
>     fi
> }
>@@ -942,6 +946,7 @@
>                 echo "Cannot use the core_collector option on this arch"
>                 rm -rf $MNTIMAGE
>                 rm -rf $IMAGE
>+                rm -f $TMPDISKLIST
>                 exit 1
>             fi
>             ;;
>@@ -1019,6 +1024,7 @@
>             echo "please install it and restart the kdump service"
>             rm -rf $MNTIMAGE
>             rm -rf $IMAGE
>+            rm -f $TMPDISKLIST
>             exit 1
>         fi
>         XEN_OPTS=""
>@@ -1034,6 +1040,7 @@
>                 echo "please install it and restart the kdump service"
>                 rm -rf $MNTIMAGE
>                 rm -rf $IMAGE
>+                rm -f $TMPDISKLIST
>                 exit 1
>             fi
> 
>@@ -1046,6 +1053,7 @@
>             echo "could not generate makedumpfile configuration.  aborting"
>             rm -rf $MNTIMAGE
>             rm -rf $IMAGE
>+            rm -f $TMPDISKLIST
>             exit 1;
>         fi
>     fi
>@@ -1087,6 +1095,9 @@
>         done
> fi
> 
>+#this provides us with a list of disks that we need to make sure we have available before we capture our core
>+mv $TMPDISKLIST $MNTIMAGE/etc/critical_disks
>+
> #THIS IS WHERE WE GENERATE OUR ADDITINONAL UTILITIES
> #Busybox doesn't have a /bin/sh applet, 
> #so we build a reasonable faximilie here
>@@ -1448,6 +1459,24 @@
>     fi
> done
> 
>+
>+# Before we create our block devices, we need to make sure that we have all the needed block devices discovered
>+# Thats seems like a chicken and egg problem, I know, but we generated  a critcal_disks list when we build this initramfs
>+# that tell us what devices we need to wait to see in /sys/block
>+
>+cat >> $MNTIMAGE/init << EOF
>+echo "Waiting for required block device discovery"
>+for i in \`cat /etc/critical_disks\`
>+do
>+    echo -n Waiting for \$i...
>+    while [ ! -d /sys/block/\$i ]
>+    do
>+        sleep 1
>+    done
>+    echo Found
>+done
>+EOF
>+    
> # HACK: module loading + device creation isn't necessarily synchronous...
> # this will make sure that we have all of our devices before trying
> # things like RAID or LVM
>@@ -1997,6 +2026,6 @@
> else
>     cp -a $IMAGE $target || rc=1
> fi
>-rm -rf $MNTIMAGE $IMAGE
>+rm -rf $MNTIMAGE $IMAGE $TMPDISKLIST
> if [ -n "$MNTPOINT" ]; then rm -rf $MNTPOINT ; fi
> exit $rc

Actions: View | Diff

Attachments on bug 446279: 305363 | 305402 | 305525 | 305717