setupMounts throws an error if run on a stopped VM

r2d4 · r2d4 · commit f6795556f812 · 2017-05-01T23:25:57.000-07:00
The 9p mount already exists in this case. This is reverting back to behavior before https://github.com/zchee/docker-machine-driver-xhyve/pull/161/files This now logs a warning, but this is a not fatal error on a recreate. I'm not sure there's a cleaner way since Start() has no context of if it is called on new VM or a recently stopped VM.
diff --git a/xhyve/xhyve.go b/xhyve/xhyve.go
@@ -499,7 +499,11 @@ func (d *Driver) Start() error {
 		return err
 	}
 
-	return d.setupMounts()
+	if err := d.setupMounts(); err != nil {
+		log.Warnf("Error setting up mounts: %v", err)
+	}
+
+	return nil
 }
 
 func (d *Driver) Stop() error {

Original file line number	Diff line number	Diff line change
`@@ -499,7 +499,11 @@ func (d *Driver) Start() error {`
`499`	`499`	`return err`
`500`	`500`	`}`
`501`	`501`
`502`		`- return d.setupMounts()`
	`502`	`+ if err := d.setupMounts(); err != nil {`
	`503`	`+ log.Warnf("Error setting up mounts: %v", err)`
	`504`	`+ }`
	`505`	`+`
	`506`	`+ return nil`
`503`	`507`	`}`
`504`	`508`
`505`	`509`	`func (d *Driver) Stop() error {`