aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--util/mount.fuse4
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index befd22c..d472ca8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
* Applied patch from Csaba Henk, to update mount_bsd to new
fuse_mount() semantics
+ * Ignore auto,noauto,... options in mount.fuse. Reported by Frank
+ Steiner and Don Taber
+
2006-01-07 Miklos Szeredi <miklos@szeredi.hu>
* Improved help reporting and added version reporting to library
diff --git a/util/mount.fuse b/util/mount.fuse
index 3ea6d9e..7eec6e0 100644
--- a/util/mount.fuse
+++ b/util/mount.fuse
@@ -41,6 +41,8 @@ MOUNTPOINT="$2"
shift
shift
-OPTIONS=`echo $@ | sed 's/,user//'`
+ignore_opts="(user|nouser|users|auto|noauto|_netdev)"
+
+OPTIONS=`echo $@ | sed -r "s/(,${ignore_opts}|${ignore_opts},)//g"`
${FSTYPE} ${MOUNTPATH} ${MOUNTPOINT} ${OPTIONS}