Merge pull request docker-archive-public#2874 from jeanlaurent/rm-infinite-loop

jeanlaurent · jeanlaurent · commit 62bcc3085942 · 2016-01-19T16:55:55.000+01:00
Fix infinite loop when deleting machine in ultra weird state
diff --git a/drivers/virtualbox/virtualbox.go b/drivers/virtualbox/virtualbox.go
@@ -615,22 +615,16 @@ func (d *Driver) Kill() error {
 }
 
 func (d *Driver) Remove() error {
-	s, err := d.GetState()
+	_, err := d.GetState()
 	if err != nil {
 		if err == ErrMachineNotExist {
 			log.Infof("machine does not exist, assuming it has been removed already")
 			return nil
 		}
 		return err
 	}
-	if s == state.Running {
-		if err := d.Stop(); err != nil {
-			return err
-		}
-	} else if s != state.Stopped {
-		if err := d.Kill(); err != nil {
-			return err
-		}
+	if err := d.Kill(); err != nil {
+		return err
 	}
 	// vbox will not release it's lock immediately after the stop
 	d.sleeper.Sleep(1 * time.Second)
