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

jeanlaurent · jeanlaurent · commit bf12d191e359 · 2016-02-18T09:54:54.000+01:00
Improve --virtualbox-no-vtx-check option to allow starting the VM
diff --git a/drivers/virtualbox/virtualbox.go b/drivers/virtualbox/virtualbox.go
@@ -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...")
