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

12
drivers/virtualbox/virtualbox.go
View File

@ -211,12 +211,14 @@ func (d *Driver) PreCreateCheck() error {
return err return err
} }
if isHyperVInstalled() {
return ErrNotCompatibleWithHyperV
}
if !d.NoVTXCheck { if !d.NoVTXCheck {
return ErrMustEnableVTX if isHyperVInstalled() {
return ErrNotCompatibleWithHyperV
}
if d.IsVTXDisabled() {
return ErrMustEnableVTX
}
} }
// Downloading boot2docker to cache should be done here to make sure // Downloading boot2docker to cache should be done here to make sure