From 3f8d0dd4871932b874ce615f54380f25539551d6 Mon Sep 17 00:00:00 2001
From: Will Stevens <wstevens@cloudops.com>
Date: Tue, 2 Dec 2014 18:24:16 -0500
Subject: [PATCH] CLOUDSTACK-7959: fixed 'qemu-img convert' compat issue

---
 tools/appliance/build.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh
index 51abb38b861..a2b5957636d 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
+set +e
 qemu-img convert -o compat=0.10 -f raw -c -O qcow2 raw.img $appliance-$branch-kvm.qcow2
+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-$branch-kvm.qcow2
+fi
 rm raw.img
 bzip2 $appliance-$branch-kvm.qcow2
 echo "$appliance exported for KVM: dist/$appliance-$branch-kvm.qcow2.bz2"