[Libvirt-cim] [PATCH] [TEST] Clean up xmt-makefvt.sh

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com&gt; # Date 1219686894 25200 # Node ID 85122957b3b312709d5b0d558e36cbe1d75203c1 # Parent 622266af7ac6bea051d5694b3bb71846d2a55e75 [TEST] Clean up xmt-makefvt.sh Add logic to remove dummy kernel. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com&gt; diff -r 622266af7ac6 -r 85122957b3b3 suites/libvirt-cim/images/xmt-makefv.sh --- a/suites/libvirt-cim/images/xmt-makefv.sh Fri Aug 22 12:38:18 2008 -0700 +++ b/suites/libvirt-cim/images/xmt-makefv.sh Mon Aug 25 10:54:54 2008 -0700 @@ -16,6 +16,7 @@ SIZE=16 QEMU_VER=082 QEMU_FILE="" +DUMMY_PATH="cimtest-dummy-image" if [ -e "/usr/lib64/xen/bin/qemu-dm" ]; then QEMU_FILE="/usr/lib64/xen/bin/qemu-dm" @@ -88,12 +89,9 @@ local image=`find /boot | grep vmlinuz | grep -v xen | tail -n1` if [ -z $image ]; then - local dummy_path="cimtest-dummy-image" - - echo "No non-Xen kernel found. Creating a fake image.\n" - touch /boot/vmlinuz-$(dummy_path) - mkdir /lib/modules/$(dummy_path) - image="/boot/vmlinuz-$(dummy_path)" + touch /boot/vmlinuz-$DUMMY_PATH + mkdir /lib/modules/$DUMMY_PATH + image="/boot/vmlinuz-$DUMMY_PATH" fi echo $image @@ -112,6 +110,12 @@ cp $kernel ${target}/vmlinuz mkinitrd --preload ata_piix ${target}/initrd $ver + + if [ $ver == $DUMMY_PATH ]; then + echo "No non-Xen kernel found. Using a fake image." + rm /boot/vmlinuz-$DUMMY_PATH + rm -rf /lib/modules/$DUMMY_PATH + fi } grub_image() {