From f412e07d715428b3b7d911e3cd0c71cd79949962 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Thu, 4 Dec 2014 19:28:43 +0530 Subject: [PATCH] CLOUDSTACK-7959: fixed 'qemu-img convert' compat issue Backported using fix 03daae571b44354d31913c7e0ecb9e1f64cdcd55 by Will Stevens Signed-off-by: Rohit Yadav --- tools/appliance/build.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh index a9c0a0a13d8..d5fc134f28d 100755 --- a/tools/appliance/build.sh +++ b/tools/appliance/build.sh @@ -90,7 +90,14 @@ set -e # Export for KVM vboxmanage internalcommands converttoraw -format vdi "$hdd_path" raw.img -qemu-img convert -f raw -c -O qcow2 raw.img $appliance-$build_date-$branch-kvm.qcow2 +set +e +qemu-img convert -o compat=0.10 -f raw -c -O qcow2 raw.img $appliance-$build_date-$branch-kvm.qcow2 +local qemuresult=$? +set -e +if [ ${qemuresult} != 0 ]; then + log INFO "'qemu-img convert' failed, trying without compat option" + qemu-img convert -f raw -c -O qcow2 raw.img $appliance-$build_date-$branch-kvm.qcow2 +fi rm raw.img bzip2 $appliance-$build_date-$branch-kvm.qcow2 echo "$appliance exported for KVM: dist/$appliance-$build_date-$branch-kvm.qcow2.bz2"