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

2
drivers/virtualbox/virtualbox.go
View File

@ -489,6 +489,7 @@ func (d *Driver) Start() error {
log.Infof("VM not in restartable state") log.Infof("VM not in restartable state")
} }
if !d.NoVTXCheck {
// Verify that VT-X is not disabled in the started VM // Verify that VT-X is not disabled in the started VM
vtxIsDisabled, err := d.IsVTXDisabledInTheVM() vtxIsDisabled, err := d.IsVTXDisabledInTheVM()
if err != nil { if err != nil {
@ -498,6 +499,7 @@ func (d *Driver) Start() error {
if vtxIsDisabled { if vtxIsDisabled {
return ErrMustEnableVTX return ErrMustEnableVTX
} }
}
log.Infof("Waiting for an IP...") log.Infof("Waiting for an IP...")
if err := d.ipWaiter.Wait(d); err != nil { if err := d.ipWaiter.Wait(d); err != nil {