Skip to content

Commit 03daae5

Browse files
CLOUDSTACK-7959: fixed 'qemu-img convert' compat issue
1 parent a72f14e commit 03daae5

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

tools/appliance/build.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,14 @@ function kvm_export() {
427427
log INFO "creating kvm export"
428428
local hdd_path="${1}"
429429
vboxmanage internalcommands converttoraw -format vdi "${hdd_path}" raw.img
430-
qemu-img convert -f raw -c -O qcow2 raw.img "${appliance_build_name}-kvm.qcow2"
430+
set +e
431+
qemu-img convert -o compat=0.10 -f raw -c -O qcow2 raw.img "${appliance_build_name}-kvm.qcow2"
432+
local qemuresult=$?
433+
set -e
434+
if [ ${qemuresult} != 0 ]; then
435+
log INFO "'qemu-img convert' failed, trying without compat option"
436+
qemu-img convert -f raw -c -O qcow2 raw.img "${appliance_build_name}-kvm.qcow2"
437+
fi
431438
add_on_exit rm -f raw.img
432439
bzip2 "${appliance_build_name}-kvm.qcow2"
433440
mv "${appliance_build_name}-kvm.qcow2.bz2" dist/

0 commit comments

Comments
 (0)