Move the NFS and 9p mounting code from Create to Start.

This will re-mount on a re-start.

Author: dlorenc

xhyve/xhyve.go

@@ -441,21 +441,7 @@ func (d *Driver) Create() error {
 		return err
 	}
 
-	if d.Virtio9p {
-		err = d.setupVirt9pShare()
-		if err != nil {
-			log.Errorf("virtio-9p setup failed: %s", err.Error())
-		}
-	}
-
-	// Setup NFS sharing
-	if d.NFSShare {
-		log.Infof("NFS share folder must be root. Please insert root password.")
-		err = d.setupNFSShare()
-		if err != nil {
-			log.Errorf("NFS setup failed: %s", err.Error())
-		}
-	}
+	d.setupMounts()
 
 	return nil
 }
@@ -496,6 +482,8 @@ func (d *Driver) Start() error {
 		}
 	}()
 
+	d.setupMounts()
+
 	return d.waitForIP()
 }
 
@@ -744,6 +732,27 @@ func (d *Driver) generateQcow2Image(size int64) error {
 	return nil
 }
 
+func (d *Driver) setupMounts() error {
+	if d.Virtio9p {
+		err = d.setupVirt9pShare()
+		if err != nil {
+			log.Errorf("virtio-9p setup failed: %s", err.Error())
+			return err
+		}
+	}
+
+	// Setup NFS sharing
+	if d.NFSShare {
+		log.Infof("NFS share folder must be root. Please insert root password.")
+		err = d.setupNFSShare()
+		if err != nil {
+			log.Errorf("NFS setup failed: %s", err.Error())
+			return err
+		}
+	}
+	return nil
+}
+
 // zeroFill writes n zero bytes into w.
 func zeroFill(w io.Writer, n int64) error {
 	const blocksize = 32 << 10