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

Merge pull request #3018 from hypriot/improve-no-vtx-check 

Improve --virtualbox-no-vtx-check option to allow starting the VM
This commit is contained in:
Jean-Laurent de Morlhon 2016-02-18 09:54:54 +01:00
parent 95644775c4 78efd68886
commit bf12d191e3
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/virtualbox/virtualbox.go
View File

@ -489,14 +489,16 @@ func (d *Driver) Start() error {
log.Infof("VM not in restartable state")
}
// Verify that VT-X is not disabled in the started VM
vtxIsDisabled, err := d.IsVTXDisabledInTheVM()
if err != nil {
return fmt.Errorf("Checking if hardware virtualization is enabled failed: %s", err)
}
if !d.NoVTXCheck {
// Verify that VT-X is not disabled in the started VM
vtxIsDisabled, err := d.IsVTXDisabledInTheVM()
if err != nil {
return fmt.Errorf("Checking if hardware virtualization is enabled failed: %s", err)
}
if vtxIsDisabled {
return ErrMustEnableVTX
if vtxIsDisabled {
return ErrMustEnableVTX
}
}
log.Infof("Waiting for an IP...")