weedfuse: adapt to fstab command line pattern

This commit is contained in:
Chris Lu
2019-05-11 01:17:55 -07:00
parent 9a4fb14ea0
commit 4dfcd2169e
2 changed files with 115 additions and 6 deletions

View File

@@ -13,20 +13,45 @@ import (
)
var (
options = flag.String("o", "", "comma separated options rw,uid=xxx,gid=xxx")
isForeground = flag.Bool("foreground", false, "starts as a daemon")
fuseCommand = flag.NewFlagSet("weedfuse", flag.ContinueOnError)
options = fuseCommand.String("o", "", "comma separated options rw,uid=xxx,gid=xxx")
isForeground = fuseCommand.Bool("foreground", false, "starts as a daemon")
)
func main() {
flag.Parse()
err := fuseCommand.Parse(os.Args[1:])
if err != nil {
glog.Fatal(err)
}
fmt.Printf("options: %v\n", *options)
device := flag.Arg(0)
mountPoint := flag.Arg(1)
// seems this value is always empty, need to parse it differently
optionsString := *options
prev := ""
for i, arg := range os.Args {
fmt.Printf("args[%d]: %v\n", i, arg)
if prev == "-o" {
optionsString = arg
}
prev = arg
}
device := fuseCommand.Arg(0)
mountPoint := fuseCommand.Arg(1)
fmt.Printf("source: %v\n", device)
fmt.Printf("target: %v\n", mountPoint)
nouser := true
for _, option := range strings.Split(optionsString, ",") {
fmt.Printf("option: %v\n", option)
switch option {
case "user":
nouser = false
}
}
maybeSetupPath()
if !*isForeground {
@@ -39,7 +64,7 @@ func main() {
command.RunMount(
filer, "/"+filerPath, mountPoint, "", "000", "",
4, true, 0, 1000000)
4, !nouser, 0, 1000000)
}