...
|
...
|
@@ -62,7 +62,12 @@ CITEST_BRANCH=master
|
62
|
62
|
# http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-rootfs.img.gz
|
63
|
63
|
#IMAGE_URLS="http://smoser.brickies.net/ubuntu/ttylinux-uec/ttylinux-uec-amd64-11.2_2.6.35-15_1.tar.gz" # old ttylinux-uec image
|
64
|
64
|
#IMAGE_URLS="http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img" # cirros full disk image
|
65
|
|
-IMAGE_URLS="http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-uec.tar.gz" # uec style cirros image
|
|
65
|
+case "$LIBVIRT_TYPE" in
|
|
66
|
+ lxc) # the cirros root disk in the uec tarball is empty, so it will not work for lxc
|
|
67
|
+ IMAGE_URLS="http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-rootfs.img.gz";;
|
|
68
|
+ *) # otherwise, use the uec style image (with kernel, ramdisk, disk)
|
|
69
|
+ IMAGE_URLS="http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-uec.tar.gz";;
|
|
70
|
+esac
|
66
|
71
|
|
67
|
72
|
# allow local overrides of env variables
|
68
|
73
|
if [ -f ./localrc ]; then
|