Merge branch 'hotfix/4.5-7959' into 4.5

This commit is contained in:
Daan Hoogland 2014-12-08 16:47:26 +01:00
commit b0845150fb
1 changed files with 7 additions and 0 deletions

View File

@ -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"