haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #9507 from briancain/fix-hyper-v-check 

Fix Hyper-v and VirtualBox check
This commit is contained in:
Brian Cain 2018-02-26 14:54:51 -08:00 committed by GitHub
parent fc30a8302c f2954a64c6
commit 0b92123163
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/providers/virtualbox/action/check_virtualbox.rb
View File

@ -1,3 +1,5 @@
require 'vagrant/util/platform'
module VagrantPlugins module VagrantPlugins
module ProviderVirtualBox module ProviderVirtualBox
module Action module Action
@ -5,6 +7,7 @@ module VagrantPlugins
class CheckVirtualbox class CheckVirtualbox
def initialize(app, env) def initialize(app, env)
@app = app @app = app
@logger = Log4r::Logger.new("vagrant::provider::virtualbox")
end end
def call(env) def call(env)
@ -13,6 +16,12 @@ module VagrantPlugins
# which will break us out of execution of the middleware sequence. # which will break us out of execution of the middleware sequence.
Driver::Meta.new.verify! Driver::Meta.new.verify!
if Vagrant::Util::Platform.windows? && Vagrant::Util::Platform.windows_hyperv_enabled?
@logger.error("Virtualbox and Hyper-V cannot be used together at the same time on Windows and will result in a system crash.")
raise Vagrant::Errors::HypervVirtualBoxError
end
# Carry on. # Carry on.
@app.call(env) @app.call(env)
end end

6
plugins/providers/virtualbox/driver/base.rb
View File

@ -78,12 +78,6 @@ module VagrantPlugins
end end
end end
if Vagrant::Util::Platform.windows? && Vagrant::Util::Platform.windows_hyperv_enabled?
@logger.error("Virtualbox and Hyper-V cannot be used together at the same time on Windows and will result in a system crash.")
raise Vagrant::Errors::HypervVirtualBoxError
end
# Fall back to hoping for the PATH to work out # Fall back to hoping for the PATH to work out
@vboxmanage_path ||= "VBoxManage" @vboxmanage_path ||= "VBoxManage"
@logger.info("VBoxManage path: #{@vboxmanage_path}") @logger.info("VBoxManage path: #{@vboxmanage_path}")