Make sure both Virtio9p shared folders and NFS shared folders can be used at the same time.

In this commit I removed the `d.setupMount()` from the `Start()` function: `Start()` simply starts the docker-machine and isn't supposed to do any other work. For example, you can not add more CPUs, more RAM, or more Disks with the `docker-machine start` command. Just like CPU, RAM, etc, Shared Folders can not be added after the fact with `docker-machine start` and as such, the `d.setupMounts()` shouldn't run.

I, however, changed the `Create()` function so that it returns an error, and thus prevents the docker-machine from being created, when the `d.setupMounts()` fails.

The other changes address the bug where you couldn't have both Virtio9p *and* NFS shared folders. The bug was that both the code setting up Virtio9p shares and the NFS shares would overwrite the `bootlocal.sh` script.

Author: huguesalary

xhyve/xhyve.go

@@ -484,7 +484,9 @@ func (d *Driver) Create() error {
 		return err
 	}
 
-	d.setupMounts()
+	if err := d.setupMounts(); err != nil {
+		return fmt.Errorf("Error setting up mounts: %v", err)
+	}
 
 	return nil
 }
@@ -535,10 +537,6 @@ func (d *Driver) Start() error {
 		return err
 	}
 
-	if err := d.setupMounts(); err != nil {
-		log.Warnf("Error setting up mounts: %v", err)
-	}
-
 	return nil
 }
 
@@ -1006,8 +1004,8 @@ func (d *Driver) setupVirt9pShare() error {
 		i++
 	}
 
-	writeScriptCmd := fmt.Sprintf("echo -e \"%s\" | sudo tee %s && sudo chmod +x %s && %s",
-		bootScript, bootScriptName, bootScriptName, bootScriptName)
+	writeScriptCmd := fmt.Sprintf("echo -e \"%s\" | sudo tee -a %s && sudo chmod +x %s",
+		bootScript, bootScriptName, bootScriptName)
 
 	if _, err := drivers.RunSSHCommandFromDriver(d, writeScriptCmd); err != nil {
 		return err
@@ -1056,8 +1054,8 @@ func (d *Driver) setupNFSShare() error {
 		return err
 	}
 
-	writeScriptCmd := fmt.Sprintf("echo -e \"%s\" | sudo tee %s && sudo chmod +x %s && %s",
-		bootScript, bootScriptName, bootScriptName, bootScriptName)
+	writeScriptCmd := fmt.Sprintf("echo -e \"%s\" | sudo tee -a %s && sudo chmod +x %s",
+		bootScript, bootScriptName, bootScriptName)
 
 	if _, err := drivers.RunSSHCommandFromDriver(d, writeScriptCmd); err != nil {
 		return err