aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2023-09-16 12:59:11 +0200
committerSven Gothel <[email protected]>2023-09-16 12:59:11 +0200
commit0902468c0092fee61a0b976dce4ffdf3e112c1c1 (patch)
tree83ed83b9e5df3474f547fc6288c95cd327e25013
parente94dfc24dd078b69f65575427630796a461204b8 (diff)
qemu-img rebase and create now require to add the format of the base image
-rwxr-xr-xbuild.sh4
-rw-r--r--scripts/qcow2_handling2
2 files changed, 3 insertions, 3 deletions
diff --git a/build.sh b/build.sh
index 58ae700..5756439 100755
--- a/build.sh
+++ b/build.sh
@@ -437,7 +437,7 @@ for EXPORT_DIR in ${EXPORT_DIRS}; do
continue
fi
echo "Rebasing image-${CURR_STAGE}.qcow2 onto ${PREV_IMG}.qcow2"
- qemu-img rebase -f qcow2 -u -b ${PREV_IMG}.qcow2 image-${CURR_STAGE}.qcow2
+ qemu-img rebase -f qcow2 -u -b ${PREV_IMG}.qcow2 image-${CURR_STAGE}.qcow2 -F qcow2
if [ "${CURR_STAGE}" = "${EXPORT_STAGE}" ]; then
break
fi
@@ -455,7 +455,7 @@ for EXPORT_DIR in ${EXPORT_DIRS}; do
continue
fi
echo "Rebasing back image-${CURR_STAGE}.qcow2 onto ${PREV_IMG}.qcow2"
- qemu-img rebase -f qcow2 -u -b ${PREV_IMG}.qcow2 image-${CURR_STAGE}.qcow2
+ qemu-img rebase -f qcow2 -u -b ${PREV_IMG}.qcow2 image-${CURR_STAGE}.qcow2 -F qcow2
if [ "${CURR_STAGE}" = "${EXPORT_STAGE}" ]; then
break
fi
diff --git a/scripts/qcow2_handling b/scripts/qcow2_handling
index e996e8f..089a999 100644
--- a/scripts/qcow2_handling
+++ b/scripts/qcow2_handling
@@ -236,7 +236,7 @@ EOF
fi
echo "Creating backing image: image-${STAGE}.qcow2 <- ${WORK_DIR}/image-${PREV_STAGE}.qcow2"
qemu-img create -f qcow2 \
- -o backing_file=${WORK_DIR}/image-${PREV_STAGE}.qcow2 \
+ -b ${WORK_DIR}/image-${PREV_STAGE}.qcow2 -F qcow2 \
${WORK_DIR}/image-${STAGE}.qcow2
sync
qemu-nbd --discard=unmap -c /dev/${NBD_DEV} image-${STAGE}.qcow2