Enable virtualbox and disk config in single flag

This commit is contained in:
Brian Cain 2020-01-24 13:58:47 -08:00
parent b594715ded
commit f59a5c2c70
No known key found for this signature in database
GPG Key ID: 9FC4639B2E4510A0

View File

@ -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