From 5328c68f443f00d98565f22d1150f78f69cbd704 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Thu, 22 Jun 2017 13:23:50 -0700 Subject: [PATCH 1/2] build_library: split vagrant and vagrant vbox This reverts the vagrant image back to using oem-vagrant because we don't want to break the existing images. It moves the new, Ignition-powered virtualbox flavor of vagrant into a new image. --- build_library/vm_image_util.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh index 4880307fd7..d81f36e994 100644 --- a/build_library/vm_image_util.sh +++ b/build_library/vm_image_util.sh @@ -146,7 +146,15 @@ IMG_vagrant_BUNDLE_FORMAT=box IMG_vagrant_DISK_FORMAT=vmdk_ide IMG_vagrant_DISK_LAYOUT=vagrant IMG_vagrant_CONF_FORMAT=vagrant -IMG_vagrant_OEM_PACKAGE=oem-vagrant-virtualbox +IMG_vagrant_OEM_PACKAGE=oem-vagrant + +## vagrant_virtualbox +IMG_vagrant_virtualbox_FS_HOOK=box +IMG_vagrant_virtualbox_BUNDLE_FORMAT=box +IMG_vagrant_virtualbox_DISK_FORMAT=vmdk_ide +IMG_vagrant_virtualbox_DISK_LAYOUT=vagrant +IMG_vagrant_virtualbox_CONF_FORMAT=vagrant +IMG_vagrant_virtualbox_OEM_PACKAGE=oem-vagrant-virtualbox ## vagrant_vmware IMG_vagrant_vmware_fusion_FS_HOOK=box From 2c22b7d29e9551a5427310714ca5d90200223110 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 22 Jun 2017 13:41:15 -0700 Subject: [PATCH 2/2] build_library: Add vagrant_virtualbox image type --- build_library/vm_image_util.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh index d81f36e994..938f789a6c 100644 --- a/build_library/vm_image_util.sh +++ b/build_library/vm_image_util.sh @@ -20,6 +20,7 @@ VALID_IMG_TYPES=( rackspace_vhd vagrant vagrant_parallels + vagrant_virtualbox vagrant_vmware_fusion virtualbox vmware