From 608e7ab89c7f6c4362f8e9a07133adcd26aa63da Mon Sep 17 00:00:00 2001 From: Nikolaus Rath Date: Tue, 26 Sep 2017 12:41:30 +0100 Subject: Ignore fstab-specific mount options Fixes: #96. --- sshfs.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'sshfs.c') 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[] = { -- cgit v1.2.3