[Libvirt-cim] [PATCH] [TEST] Fix image creation for KVM only systems, also create LXC init script

[Guo Lian Yun]

+1 for me.

Best,
Regards

Daisy (运国莲)
VSM Team, China Systems & Technology Labs (CSTL)
E-mail: yunguol at cn.ibm.com
TEL: (86)-21-60922403
Building 10, 399 Ke Yuan Rd, Pudong Shanghai, 201203


libvirt-cim-bounces at redhat.com wrote on 2008-08-07 23:04:23:

> # HG changeset patch
> # User Kaitlin Rupert <karupert at us.ibm.com>
> # Date 1218121427 25200
> # Node ID 67b52446e366c76953949c7680fe2e18fae375c9
> # Parent  0f568c2c36035da2574e11d128780833392e43af
> [TEST] Fix image creation for KVM only systems, also create LXC init 
script
> 
> If the box isn't booted on a Xen kernel, then Xen guests won't work.
> So I think it's safe to not create the /tmp/default-xen-kernel file.
> 
> Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>
> 
> diff -r 0f568c2c3603 -r 67b52446e366 suites/libvirt-cim/images/Makefile
> --- a/suites/libvirt-cim/images/Makefile   Wed Aug 06 06:08:02 2008 
-0700
> +++ b/suites/libvirt-cim/images/Makefile   Thu Aug 07 08:03:47 2008 
-0700
> @@ -23,6 +23,7 @@
>  DEFAULT_INITRD = /tmp/default-xen-initrd
>  DEFAULT_DIMAGE = /tmp/default-xen-dimage
>  DEFAULT_KVMIMG = /tmp/default-kvm-dimage
> +DEFAULT_LXCINIT = /tmp/cimtest_lxc_init
> 
>  SECONDARY_DIMAGE = $(DEFAULT_DIMAGE).2ND
>  SECONDARY_KVMIMG = $(DEFAULT_KVMIMG).2ND
> @@ -34,13 +35,11 @@
>  XMT_URL=http://xm-test.xensource.com/ramdisks/initrd-1.1-i386.img
> 
>  # Default to xm-test ramdisk image & kvm image for now
> -default: xmtestimage $(DEFAULT_KERNEL) $(DEFAULT_KVMIMG)
> +default: xmtestimage $(DEFAULT_KERNEL) $(DEFAULT_KVMIMG) 
$(DEFAULT_LXCINIT)
> 
>  $(DEFAULT_KERNEL):
>     if uname -r | grep -q xen; then \
>        cp /boot/vmlinuz-`uname -r` $@; \
> -   else \
> -      cp /boot/vmlinuz-xen $@; \
>     fi
> 
>  $(XMT_INITRD):
> @@ -65,8 +64,11 @@
>     cp $(XMT_DIMAGE) $(DEFAULT_KVMIMG)
>     cp $(XMT_DIMAGE) $(SECONDARY_KVMIMG)
> 
> +$(DEFAULT_LXCINIT):
> +   echo  "exec /bin/bash" > $(DEFAULT_LXCINIT)
> +   chmod 755 $(DEFAULT_LXCINIT)
> 
>  clean:
> -   rm -f $(DEFAULT_KERNEL) $(DEFAULT_INITRD) $(DEFAULT_DIMAGE) 
> $(SECONDARY_DIMAGE)
> +   rm -f $(DEFAULT_KERNEL) $(DEFAULT_INITRD) $(DEFAULT_DIMAGE) 
> $(SECONDARY_DIMAGE) $(DEFAULT_LXCINIT)
>     rm -f $(DEFAULT_KVMIMG) $(SECONDARY_KVMIMG)
>     rm -Rf $(XMT_BASE)
> 
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080811/a9595701/attachment.htm>