From cab8e3ed37a297e8e29d545560f6406221fd7b1f Mon Sep 17 00:00:00 2001 From: Alexander Pavel Date: Wed, 14 Jun 2017 13:21:21 -0700 Subject: [PATCH 1/2] build_library: Add virtualbox oem to vm_image_util This commit adds support for the oem-virtualbox package for virtualbox builds --- build_library/vm_image_util.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh index 73d17ad898..bfcf81d124 100644 --- a/build_library/vm_image_util.sh +++ b/build_library/vm_image_util.sh @@ -55,6 +55,7 @@ VALID_OEM_PACKAGES=( rackspace-onmetal vagrant vagrant-key + virtualbox vmware niftycloud cloudsigma @@ -136,6 +137,7 @@ IMG_xen_CONF_FORMAT=xl IMG_virtualbox_DISK_FORMAT=vmdk_ide IMG_virtualbox_DISK_LAYOUT=vm IMG_virtualbox_CONF_FORMAT=ovf_virtualbox +IMG_virtualbox_OEM_PACKAGE=oem-virtualbox ## vagrant IMG_vagrant_FS_HOOK=box From 7298b0bf2acf51f5326e122628e6da30248b5d0d Mon Sep 17 00:00:00 2001 From: Alexander Pavel Date: Wed, 14 Jun 2017 13:22:55 -0700 Subject: [PATCH 2/2] build_library: Change oem package for vagrant to oem-vagrant-virtualbox This changes the oem-package for vagrant to vagrant-virtualbox, which uses ignition instead of cloud-clonfig and sets the oem id to "virtualbox" so that ignition can handle the machine correctly --- build_library/vm_image_util.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh index bfcf81d124..4880307fd7 100644 --- a/build_library/vm_image_util.sh +++ b/build_library/vm_image_util.sh @@ -55,6 +55,7 @@ VALID_OEM_PACKAGES=( rackspace-onmetal vagrant vagrant-key + vagrant-virtualbox virtualbox vmware niftycloud @@ -145,7 +146,7 @@ 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 +IMG_vagrant_OEM_PACKAGE=oem-vagrant-virtualbox ## vagrant_vmware IMG_vagrant_vmware_fusion_FS_HOOK=box