allow --sshfs-nonempty

Signed-off-by: Akihiro Suda <[email protected]>
lima-vm · May 10, 2021 · 56aa3c7 · 56aa3c7
1 parent 15a30be
commit 56aa3c7
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 21 deletions.
diff --git a/cmd/sshocker/run.go b/cmd/sshocker/run.go
@@ -36,6 +36,11 @@ var (
 			Name:  "p",
 			Usage: "Expose a port, e.g. `8080:80` to forward the port 8080 the client onto the port 80 on the server",
 		},
+		&cli.BoolFlag{
+			Name:  "sshfs-nonempty",
+			Usage: "enable sshfs nonempty",
+			Value: false,
+		},
 	}
 	runCommand = &cli.Command{
 		Name:   "run",
@@ -74,11 +79,16 @@ func runAction(clicontext *cli.Context) error {
 	if err != nil {
 		return err
 	}
+	var sshfsAdditionalArgs []string
+	if clicontext.Bool("sshfs-nonempty") {
+		sshfsAdditionalArgs = append(sshfsAdditionalArgs, "-o", "nonempty")
+	}
 	x := &sshocker.Sshocker{
-		SSHConfig: sshConfig,
-		Host:      host,
-		Port:      port,
-		Command:   clicontext.Args().Tail(),
+		SSHConfig:           sshConfig,
+		Host:                host,
+		Port:                port,
+		Command:             clicontext.Args().Tail(),
+		SSHFSAdditionalArgs: sshfsAdditionalArgs,
 	}
 	if len(x.Command) > 0 && x.Command[0] == "--" {
 		x.Command = x.Command[1:]

diff --git a/pkg/reversesshfs/reversesshfs.go b/pkg/reversesshfs/reversesshfs.go
@@ -18,12 +18,13 @@ import (
 
 type ReverseSSHFS struct {
 	*ssh.SSHConfig
-	LocalPath  string
-	Host       string
-	Port       int
-	RemotePath string
-	Readonly   bool
-	sshCmd     *exec.Cmd
+	LocalPath           string
+	Host                string
+	Port                int
+	RemotePath          string
+	Readonly            bool
+	sshCmd              *exec.Cmd
+	SSHFSAdditionalArgs []string
 }
 
 func (rsf *ReverseSSHFS) Prepare() error {
@@ -55,6 +56,7 @@ func (rsf *ReverseSSHFS) Start() error {
 	if rsf.Readonly {
 		sshArgs = append(sshArgs, "-o", "ro")
 	}
+	sshArgs = append(sshArgs, rsf.SSHFSAdditionalArgs...)
 	rsf.sshCmd = exec.Command(sshBinary, sshArgs...)
 	rsf.sshCmd.Stderr = os.Stderr
 	stdinPipe, err := rsf.sshCmd.StdinPipe()

diff --git a/pkg/sshocker/sshocker.go b/pkg/sshocker/sshocker.go
@@ -14,11 +14,12 @@ import (
 
 type Sshocker struct {
 	*ssh.SSHConfig
-	Host      string   // Required
-	Port      int      // Required
-	Command   []string // Optional
-	Mounts    []mount.Mount
-	LForwards []string
+	Host                string   // Required
+	Port                int      // Required
+	Command             []string // Optional
+	Mounts              []mount.Mount
+	LForwards           []string
+	SSHFSAdditionalArgs []string
 }
 
 func (x *Sshocker) Run() error {
@@ -43,12 +44,13 @@ func (x *Sshocker) Run() error {
 		switch m.Type {
 		case mount.MountTypeReverseSSHFS:
 			rsf := &reversesshfs.ReverseSSHFS{
-				SSHConfig:  x.SSHConfig,
-				LocalPath:  m.Source,
-				Host:       x.Host,
-				Port:       x.Port,
-				RemotePath: m.Destination,
-				Readonly:   m.Readonly,
+				SSHConfig:           x.SSHConfig,
+				LocalPath:           m.Source,
+				Host:                x.Host,
+				Port:                x.Port,
+				RemotePath:          m.Destination,
+				Readonly:            m.Readonly,
+				SSHFSAdditionalArgs: x.SSHFSAdditionalArgs,
 			}
 			if err := rsf.Prepare(); err != nil {
 				return errors.Wrapf(err, "failed to prepare mounting %q (local) onto %q (remote)", rsf.LocalPath, rsf.RemotePath)