diff options
| author | Jakob Unterwurzacher | 2018-06-07 22:50:30 +0200 |
|---|---|---|
| committer | Jakob Unterwurzacher | 2018-06-07 22:50:30 +0200 |
| commit | 53d6a9999dd0e4c31636d16179f284fff35a35d9 (patch) | |
| tree | d2a41d46e397fcfc57c9d2da87baf9599b972704 /daemonize.go | |
| parent | e29a81efc3df88b451a4a9464724a952d97b4115 (diff) | |
main: accept -dev, -nodev, -suid, -nosuid, -exec, -noexec
When mounted via /etc/fstab like this,
/a /b fuse.gocryptfs default 0 0
we always get extra options passed. As reported by @mahkoh
at https://github.com/rfjakob/gocryptfs/pull/233 :
mount passes `-o noexec` if `-o user` is set and `-o exec` is not set.
If both `-o user` and `-o exec` are set, it passes `-o exec`.
Make these options work, and in addtion, also make -suid and -rw
work the same way.
Reported-by: @mahkoh
Diffstat (limited to 'daemonize.go')
| -rw-r--r-- | daemonize.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/daemonize.go b/daemonize.go index 03c4fc4..abb6d08 100644 --- a/daemonize.go +++ b/daemonize.go @@ -37,7 +37,7 @@ func forkChild() int { exitOnUsr1() err := c.Start() if err != nil { - tlog.Fatal.Printf("forkChild: starting %s failed: %v\n", name, err) + tlog.Fatal.Printf("forkChild: starting %s failed: %v", name, err) return exitcodes.ForkChild } err = c.Wait() @@ -47,7 +47,7 @@ func forkChild() int { os.Exit(waitstat.ExitStatus()) } } - tlog.Fatal.Printf("forkChild: wait returned an unknown error: %v\n", err) + tlog.Fatal.Printf("forkChild: wait returned an unknown error: %v", err) return exitcodes.ForkChild } // The child exited with 0 - let's do the same. |