[Libvirt-cim] [PATCH] [TEST] #2 Make RHEL 5 XenFV guest grub conf use hda

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com&gt; # Date 1211564341 25200 # Node ID cefb85c07235328269cd17c08f3368941374ea96 # Parent 3233a070377270931b4cc1d790b6782fee17d1b6 [TEST] #2 Make RHEL 5 XenFV guest grub conf use hda. It looks like qemu on RHEL emulates an ide drive, not a scsi drive. Updates: -Instead of using distro, use qemu-dm version. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com&gt; diff -r 3233a0703772 -r cefb85c07235 suites/libvirt-cim/images/xmt-makefv.sh --- a/suites/libvirt-cim/images/xmt-makefv.sh Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/images/xmt-makefv.sh Fri May 23 10:39:01 2008 -0700 @@ -14,6 +14,9 @@ PARTED="parted -s" TMPMOUNT=/tmp/cimtest_image_temp SIZE=16 +QEMU_VER=082 + +CUR_QEMU_VER=`strings /usr/lib64/xen/bin/qemu-dm | awk '/version [0-9]/ { print $5; }' | sed 's/,//' | sed 's/\.//g'` die() { echo "FAILED: $i" >&2 @@ -110,10 +113,19 @@ timeout 1 title Test Environment root (hd0,0) +EOF + +if [ $CUR_QEMU_VER -lt $QEMU_VER ]; then + cat >>${root}/grub/grub.conf <<EOF + kernel /vmlinuz root=/dev/hda1 + initrd /initrd +EOF +else + cat >>${root}/grub/grub.conf <<EOF kernel /vmlinuz root=/dev/sda1 initrd /initrd EOF - +fi } ramdisk=$1