Export stage completely reworked, uses qemu-img commit now

2019-12-02 17:19:05 +01:00
parent 53de9f344c
commit 4ea3675b52
6 changed files with 314 additions and 106 deletions
@@ -77,34 +77,30 @@ cp "$ROOTFS_DIR/etc/rpi-issue" "$INFO_FILE"
 	dpkg -l --root "$ROOTFS_DIR"
 } >> "$INFO_FILE"

-ROOT_DEV="$(mount | grep "${ROOTFS_DIR} " | cut -f1 -d' ')"
-
-unmount "${ROOTFS_DIR}"
-zerofree "${ROOT_DEV}"
-
-unmount_image "${IMG_FILE}"
-
 mkdir -p "${DEPLOY_DIR}"

 rm -f "${DEPLOY_DIR}/${ZIP_FILENAME}${IMG_SUFFIX}.zip"
 rm -f "${DEPLOY_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.img"

+mv "$INFO_FILE" "$DEPLOY_DIR/"
+
+if [ "${USE_QCOW2}" = "0" ] && [ "${NO_PRERUN_QCOW2}" = "0" ]; then
+    ROOT_DEV="$(mount | grep "${ROOTFS_DIR} " | cut -f1 -d' ')"
+
+    unmount "${ROOTFS_DIR}"
+    zerofree "${ROOT_DEV}"
+
+    unmount_image "${IMG_FILE}"
+else
+    unload_qimage
+    make_bootable_image "${STAGE_WORK_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.qcow2" "$IMG_FILE"
+fi
+
 if [ "${DEPLOY_ZIP}" == "1" ]; then
 	pushd "${STAGE_WORK_DIR}" > /dev/null
 	zip "${DEPLOY_DIR}/${ZIP_FILENAME}${IMG_SUFFIX}.zip" \
 		"$(basename "${IMG_FILE}")"
 	popd > /dev/null
 else
-	if [ "${USE_QCOW2}" = "1" ]; then
-	    mv "$IMG_FILE" "$DEPLOY_DIR/"
-	else
-	    cp "$IMG_FILE" "$DEPLOY_DIR"
-	fi
+	mv "$IMG_FILE" "$DEPLOY_DIR/"
 fi
-
-if [ "${USE_QCOW2}" = "1" ]; then
-    mv "$INFO_FILE" "$DEPLOY_DIR/"
-else
-    cp "$INFO_FILE" "$DEPLOY_DIR"
-fi
-