From 5e1337307a9421df405d255e3f852059a2a54c87 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Wed, 31 Jul 2013 23:56:58 -0400
Subject: [PATCH] feat(image_to_vm): Basic vagrant disk image support

This just generates a vdi that includes the vagrant ssh key.
---
 build_library/vm_image_util.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh
index ab7e3f317f..dbeffd6dbc 100644
--- a/build_library/vm_image_util.sh
+++ b/build_library/vm_image_util.sh
@@ -9,6 +9,7 @@ VALID_IMG_TYPES=(
     ami
     qemu
     rackspace
+    vagrant
     virtualbox
     vmware
     xen
@@ -57,6 +58,10 @@ IMG_xen_CONF_FORMAT=xl
 ## virtualbox
 IMG_virtualbox_DISK_FORMAT=vdi
 
+## vagrant
+IMG_vagrant_DISK_FORMAT=vdi
+IMG_vagrant_OEM_PACKAGE=oem-vagrant
+
 ## vmware
 IMG_vmware_DISK_FORMAT=vmdk
 IMG_vmware_CONF_FORMAT=vmx
@@ -250,8 +255,7 @@ _write_raw_disk() {
 }
 
 _write_vdi_disk() {
-    sudo VBoxManage convertdd "$1" "$2"
-    sudo chown $(id -un) "$2"
+    qemu-img convert -f raw "$1" -O vdi "$2"
 }
 
 _write_vmdk_disk() {