aboutsummaryrefslogtreecommitdiff
path: root/sshfs.c
diff options
context:
space:
mode:
authorNikolaus Rath <Nikolaus@rath.org>2017-09-26 12:41:30 +0100
committerNikolaus Rath <Nikolaus@rath.org>2017-09-26 12:41:30 +0100
commit608e7ab89c7f6c4362f8e9a07133adcd26aa63da (patch)
tree82010ee910c7aabe6be0e9a90703c8c7ef7197f2 /sshfs.c
parenta73dda48bd9b9bdc925b180fd7dab4c9689da09f (diff)
downloadsshfs-608e7ab89c7f6c4362f8e9a07133adcd26aa63da.tar
sshfs-608e7ab89c7f6c4362f8e9a07133adcd26aa63da.tar.gz
sshfs-608e7ab89c7f6c4362f8e9a07133adcd26aa63da.tar.bz2
sshfs-608e7ab89c7f6c4362f8e9a07133adcd26aa63da.zip
Ignore fstab-specific mount options
Fixes: #96.
Diffstat (limited to 'sshfs.c')
-rw-r--r--sshfs.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/sshfs.c b/sshfs.c
index 50ec384..a25c637 100644
--- a/sshfs.c
+++ b/sshfs.c
@@ -428,9 +428,15 @@ static struct fuse_opt sshfs_opts[] = {
FUSE_OPT_KEY("writeback_cache=no", FUSE_OPT_KEY_DISCARD),
FUSE_OPT_KEY("unreliable_append", FUSE_OPT_KEY_DISCARD),
-
- FUSE_OPT_END
+ /* These may come in from /etc/fstab - we just ignore them */
+ FUSE_OPT_KEY("auto", FUSE_OPT_KEY_DISCARD),
+ FUSE_OPT_KEY("noauto", FUSE_OPT_KEY_DISCARD),
+ FUSE_OPT_KEY("user", FUSE_OPT_KEY_DISCARD),
+ FUSE_OPT_KEY("nouser", FUSE_OPT_KEY_DISCARD),
+ FUSE_OPT_KEY("users", FUSE_OPT_KEY_DISCARD),
+ FUSE_OPT_KEY("_netdev", FUSE_OPT_KEY_DISCARD),
+ FUSE_OPT_END
};
static struct fuse_opt workaround_opts[] = {