docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2757 from dgageot/fix-broken-vtx-detection 

Fix broken VTx detection
This commit is contained in:
Jean-Laurent de Morlhon 2016-01-06 16:11:46 +01:00
parent 4fe3bdb628 5e75bf3346
commit e9be8eef71
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/virtualbox/virtualbox.go
View File

@ -211,13 +211,15 @@ func (d *Driver) PreCreateCheck() error {
return err return err
} }
if !d.NoVTXCheck {
if isHyperVInstalled() { if isHyperVInstalled() {
return ErrNotCompatibleWithHyperV return ErrNotCompatibleWithHyperV
} }
if !d.NoVTXCheck { if d.IsVTXDisabled() {
return ErrMustEnableVTX return ErrMustEnableVTX
} }
}
// Downloading boot2docker to cache should be done here to make sure // Downloading boot2docker to cache should be done here to make sure
// that a download failure will not leave a machine half created. // that a download failure will not leave a machine half created.