Skip to content

M
mkimage-profiles
Commit 0e9a8736 authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

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.
parent bf5fd3f5
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
features.in/build-vm/lib/90-build-vm.mk
View file @ 0e9a8736
...@@ -30,7 +30,7 @@ prepare-image: check-sudo ...@@ -30,7 +30,7 @@ prepare-image: check-sudo
convert-image: prepare-image convert-image: prepare-image
@case "$(IMAGE_TYPE)" in \ @case "$(IMAGE_TYPE)" in \
"img") VM_FORMAT="raw";; \ "img") mv "$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"; exit 0;; \
"vhd") VM_FORMAT="vpc";; \ "vhd") VM_FORMAT="vpc";; \
*) VM_FORMAT="$(IMAGE_TYPE)"; \ *) VM_FORMAT="$(IMAGE_TYPE)"; \
esac; \ esac; \
...@@ -39,6 +39,7 @@ convert-image: prepare-image ...@@ -39,6 +39,7 @@ convert-image: prepare-image
else \ else \
qemu-img convert -O "$$VM_FORMAT" \ qemu-img convert -O "$$VM_FORMAT" \
"$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"; \ "$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"; \
rm "$(VM_RAWDISK)"; \
fi fi
run-image-scripts: GLOBAL_ROOTPW := $(ROOTPW) run-image-scripts: GLOBAL_ROOTPW := $(ROOTPW)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment