From 5b620d4314f8f2807ff7adb0bfe7785e0cb13ce4 Mon Sep 17 00:00:00 2001 From: Neil Hanlon Date: Wed, 23 Nov 2022 10:43:47 -0500 Subject: [PATCH] Vbox needs box.ovf --- iso/empanadas/empanadas/scripts/build_image.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/iso/empanadas/empanadas/scripts/build_image.py b/iso/empanadas/empanadas/scripts/build_image.py index 10baef1..9038355 100644 --- a/iso/empanadas/empanadas/scripts/build_image.py +++ b/iso/empanadas/empanadas/scripts/build_image.py @@ -146,7 +146,7 @@ class ImageBuild: ] if self.image_type in ["Vagrant"]: _map = { - "Vbox": {"format": "vmdk", "provider": "virtualbox", "convertOptions": ["-o", "subformat=streamOptimized"]}, + "Vbox": {"format": "vmdk", "provider": "virtualbox"}, "Libvirt": {"format": "qcow2", "provider": "libvirt", "virtual_size": 10}, "VMware": {"format": "vmdk", "provider": "vmware_desktop"} } @@ -179,9 +179,11 @@ class ImageBuild: templates['info.json'] = tmplenv.get_template('vagrant/info.tmpl.json') if self.variant == "VMware": - provider = "vmware_desktop" templates[f"{self.outname}.vmx"] = tmplenv.get_template('vagrant/vmx.tmpl') + if self.variant == "Vbox": + templates['box.ovf'] = tmplenv.get_template('vagrant/box.tmpl.ovf') + if self.variant == "Libvirt": # Libvirt vagrant driver expects the qcow2 file to be called box.img. qemu_command_index = [i for i, d in enumerate(self.stage_commands) if d[0] == "qemu-img"][0]