# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1233956315 28800 # Node ID 9efbee1b4a6dbf8525e3d2694e38a5937955af7d # Parent 263e285881acde9b99849cd133399298219c9d65 [TEST] Create default LXC mount directory as part of image build process Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com> diff -r 263e285881ac -r 9efbee1b4a6d suites/libvirt-cim/images/Makefile --- a/suites/libvirt-cim/images/Makefile Fri Feb 06 01:54:39 2009 -0800 +++ b/suites/libvirt-cim/images/Makefile Fri Feb 06 13:38:35 2009 -0800 @@ -23,7 +23,9 @@ DEFAULT_INITRD = /tmp/default-xen-initrd DEFAULT_DIMAGE = /tmp/default-xen-dimage DEFAULT_KVMIMG = /tmp/default-kvm-dimage + DEFAULT_LXCINIT = /tmp/cimtest_lxc_init +DEFAULT_LXC_MNT_DIR = /tmp/lxc_files SECONDARY_DIMAGE = $(DEFAULT_DIMAGE).2ND SECONDARY_KVMIMG = $(DEFAULT_KVMIMG).2ND @@ -35,7 +37,8 @@ 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_LXCINIT) +default: xmtestimage $(DEFAULT_KERNEL) $(DEFAULT_KVMIMG) $(DEFAULT_LXCINIT) \ + $(DEFAULT_LXC_MNT_DIR) $(DEFAULT_KERNEL): if uname -r | grep -q xen; then \ @@ -68,7 +71,11 @@ echo "exec /bin/bash" > $(DEFAULT_LXCINIT) chmod 755 $(DEFAULT_LXCINIT) +$(DEFAULT_LXC_MNT_DIR): + mkdir /tmp/lxc_files + clean: - rm -f $(DEFAULT_KERNEL) $(DEFAULT_INITRD) $(DEFAULT_DIMAGE) $(SECONDARY_DIMAGE) $(DEFAULT_LXCINIT) + rm -f $(DEFAULT_KERNEL) $(DEFAULT_INITRD) $(DEFAULT_DIMAGE) $(SECONDARY_DIMAGE) rm -f $(DEFAULT_KVMIMG) $(SECONDARY_KVMIMG) + rm -rf $(DEFAULT_LXCINIT) $(DEFAULT_LXC_MNT_DIR) rm -Rf $(XMT_BASE)