From 18fee4806f6a71e951eaee2a3910140c5efb46e3 Mon Sep 17 00:00:00 2001 From: greatroar <@> Date: Tue, 17 Mar 2020 23:32:09 +0100 Subject: [PATCH] Remove broken --allow-root from restic mount --- cmd/restic/cmd_mount.go | 6 ------ doc/bash-completion.sh | 2 -- doc/man/restic-mount.1 | 4 ---- 3 files changed, 12 deletions(-) diff --git a/cmd/restic/cmd_mount.go b/cmd/restic/cmd_mount.go index 54fee61be..86a84ff75 100644 --- a/cmd/restic/cmd_mount.go +++ b/cmd/restic/cmd_mount.go @@ -59,7 +59,6 @@ Exit status is 0 if the command was successful, and non-zero if there was any er // MountOptions collects all options for the mount command. type MountOptions struct { OwnerRoot bool - AllowRoot bool AllowOther bool NoDefaultPermissions bool Hosts []string @@ -75,7 +74,6 @@ func init() { mountFlags := cmdMount.Flags() mountFlags.BoolVar(&mountOptions.OwnerRoot, "owner-root", false, "use 'root' as the owner of files and dirs") - mountFlags.BoolVar(&mountOptions.AllowRoot, "allow-root", false, "allow root user to access the data in the mounted directory") mountFlags.BoolVar(&mountOptions.AllowOther, "allow-other", false, "allow other users to access the data in the mounted directory") mountFlags.BoolVar(&mountOptions.NoDefaultPermissions, "no-default-permissions", false, "for 'allow-other', ignore Unix permissions and allow users to read all snapshot files") @@ -119,10 +117,6 @@ func mount(opts MountOptions, gopts GlobalOptions, mountpoint string) error { systemFuse.FSName("restic"), } - if opts.AllowRoot { - mountOptions = append(mountOptions, systemFuse.AllowRoot()) - } - if opts.AllowOther { mountOptions = append(mountOptions, systemFuse.AllowOther()) diff --git a/doc/bash-completion.sh b/doc/bash-completion.sh index 9fccd85f9..7e0074c3b 100644 --- a/doc/bash-completion.sh +++ b/doc/bash-completion.sh @@ -1026,8 +1026,6 @@ _restic_mount() flags+=("--allow-other") local_nonpersistent_flags+=("--allow-other") - flags+=("--allow-root") - local_nonpersistent_flags+=("--allow-root") flags+=("--help") flags+=("-h") local_nonpersistent_flags+=("--help") diff --git a/doc/man/restic-mount.1 b/doc/man/restic-mount.1 index 58e3bc7b3..2c307fcf0 100644 --- a/doc/man/restic-mount.1 +++ b/doc/man/restic-mount.1 @@ -56,10 +56,6 @@ For details please see the documentation for time.Format() at: \fB\-\-allow\-other\fP[=false] allow other users to access the data in the mounted directory -.PP -\fB\-\-allow\-root\fP[=false] - allow root user to access the data in the mounted directory - .PP \fB\-h\fP, \fB\-\-help\fP[=false] help for mount