From f59a5c2c709937e2573f940cc2bc347fb3780256 Mon Sep 17 00:00:00 2001 From: Brian Cain Date: Fri, 24 Jan 2020 13:58:47 -0800 Subject: [PATCH] Enable virtualbox and disk config in single flag --- plugins/kernel_v2/config/vm.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/kernel_v2/config/vm.rb b/plugins/kernel_v2/config/vm.rb index 7abd9ee4b..b2fe0550d 100644 --- a/plugins/kernel_v2/config/vm.rb +++ b/plugins/kernel_v2/config/vm.rb @@ -433,7 +433,8 @@ module VagrantPlugins # Add provider config disk_config.add_provider_config(provider_options, &block) - if !Vagrant::Util::Experimental.feature_enabled?("disk_base_config") + if !Vagrant::Util::Experimental.feature_enabled?("disk_base_config") && + !Vagrant::Util::Experimental.feature_enabled?("virtualbox_disk_hdd") @logger.warn("Disk config defined, but experimental feature is not enabled. To use this feature, enable it with the experimental flag `disk_base_config`. Disk will not be added to internal config, and will be ignored.") return end