fix

diff --git a/ChangeLog b/ChangeLog
index befd22c2d6df9be474987a36174c8f91f4fcaf00..d472ca89519feb2faf18790122c40bca00530472 100644 (file)
--- 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 3ea6d9e0966c0cb2998f415823bc6c6aa6510714..7eec6e0eef51c6c1a5919494e30ee8dd259b9917 100644 (file)
--- 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}