Merge pull request #2172 from danielflira/master

This commit is contained in:
Chris Lu 2021-06-30 20:22:13 -07:00 committed by GitHub
commit 90badb8201
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -23,6 +23,7 @@ func runFuse(cmd *Command, args []string) bool {
option := strings.Builder{}
options := []parameter{}
masterProcess := true
fusermountPath := ""
// first parameter
i := 0
@ -187,6 +188,8 @@ func runFuse(cmd *Command, args []string) bool {
} else {
panic(fmt.Errorf("readRetryTime: %s", err))
}
case "fusermount.path":
fusermountPath = parameter.value
}
}
@ -213,6 +216,16 @@ func runFuse(cmd *Command, args []string) bool {
return true
}
if fusermountPath != "" {
if err := os.Setenv("PATH", fusermountPath); err != nil {
panic(fmt.Errorf("setenv: %s", err))
}
} else if os.Getenv("PATH") == "" {
if err := os.Setenv("PATH", "/bin:/sbin:/usr/bin:/usr/sbin"); err != nil {
panic(fmt.Errorf("setenv: %s", err))
}
}
// just call "weed mount" command
return runMount(cmdMount, []string{})
}