feat(image_to_vm): Switch to qcow2 as default qemu disk format.

We only really need raw images for dd'ing to block devices and this
format has been requested for some cases so lets just use it!
This commit is contained in:
Michael Marineau 2013-08-01 22:18:09 -04:00
parent b324d3d215
commit 99982182b9
2 changed files with 7 additions and 1 deletions

View File

@ -48,6 +48,7 @@ IMG_DEFAULT_CONF_FORMAT=
IMG_DEFAULT_MEM=1024 IMG_DEFAULT_MEM=1024
## qemu ## qemu
IMG_qemu_DISK_FORMAT=qcow2
IMG_qemu_CONF_FORMAT=qemu IMG_qemu_CONF_FORMAT=qemu
## xen ## xen
@ -131,6 +132,7 @@ _disk_ext() {
local disk_format=$(_get_vm_opt DISK_FORMAT) local disk_format=$(_get_vm_opt DISK_FORMAT)
case ${disk_format} in case ${disk_format} in
raw) echo bin;; raw) echo bin;;
qcow2) echo img;;
*) echo "${disk_format}";; *) echo "${disk_format}";;
esac esac
} }
@ -256,6 +258,10 @@ _write_raw_disk() {
mv "$1" "$2" mv "$1" "$2"
} }
_write_qcow2_disk() {
qemu-img convert -f raw "$1" -O qcow2 "$2"
}
_write_vmdk_disk() { _write_vmdk_disk() {
qemu-img convert -f raw "$1" -O vmdk "$2" qemu-img convert -f raw "$1" -O vmdk "$2"
} }

View File

@ -9,7 +9,7 @@ DEFAULT_MEM="1024"
DEFAULT_VMDK="ide.vmdk" DEFAULT_VMDK="ide.vmdk"
DEFAULT_VMX="coreos.vmx" DEFAULT_VMX="coreos.vmx"
DEFAULT_VBOX_DISK="os.vdi" DEFAULT_VBOX_DISK="os.vdi"
DEFAULT_QEMU_IMAGE="coreos_developer_qemu_image.bin" DEFAULT_QEMU_IMAGE="coreos_developer_qemu_image.img"
# Minimum sizes for full size vm images -- needed for update. # Minimum sizes for full size vm images -- needed for update.
MIN_VDISK_SIZE_FULL=9216 MIN_VDISK_SIZE_FULL=9216