build-vm: avoid dummy raw2raw conversion

It's better to rather just move the raw image instead of specifically converting it into the same, and there's no need for qemu-img altogether then. Let's drop the intermediate raw image after successful conversion as well.

build-vm: avoid dummy raw2raw conversion
0e9a8736 · Michael Shigorin · bf5fd3f5 · 0e9a8736
Commit 0e9a8736 authored Jun 25, 2012 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

90-build-vm.mk features.in/build-vm/lib/90-build-vm.mk +2 -1

No files found.
--- a/features.in/build-vm/lib/90-build-vm.mk
+++ b/features.in/build-vm/lib/90-build-vm.mk
@@ -30,7 +30,7 @@ prepare-image: check-sudo

 convert-image: prepare-image
 	@case "$(IMAGE_TYPE)" in \
-	"img") VM_FORMAT="raw";; \
+	"img") mv "$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"; exit 0;; \
 	"vhd") VM_FORMAT="vpc";; \
 	*) VM_FORMAT="$(IMAGE_TYPE)"; \
 	esac; \
@@ -39,6 +39,7 @@ convert-image: prepare-image
 	else \
 		qemu-img convert -O "$$VM_FORMAT" \
 			"$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"; \
+		rm "$(VM_RAWDISK)"; \
 	fi

 run-image-scripts: GLOBAL_ROOTPW := $(ROOTPW)