From 650c7f075205083e041a817379ec5359c2ba4e90 Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Mon, 26 Feb 2007 13:51:35 +0000 Subject: [PATCH] Fix detection of installed fuse in init script --- ChangeLog | 5 +++++ util/init_script | 2 +- util/mount.fuse | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9c03e88..b9b254c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-02-26 Miklos Szeredi + + * Fix detection of installed fuse in init script. Reported and + fix suggested by Davide Canova + 2007-02-05 Miklos Szeredi * Fix 2.6.9 RHEL kernels, which have compatibility mutex.h, but diff --git a/util/init_script b/util/init_script index ed964cb..0ca395f 100755 --- a/util/init_script +++ b/util/init_script @@ -12,7 +12,7 @@ DESC="FUSE" MOUNTPOINT=/sys/fs/fuse/connections # Gracefully exit if the package has been removed. -test -x `which fusermount` || exit 0 +which fusermount &>/dev/null || exit 0 error() { diff --git a/util/mount.fuse b/util/mount.fuse index 9008492..98e0ba7 100644 --- a/util/mount.fuse +++ b/util/mount.fuse @@ -48,8 +48,8 @@ shift # loop over each mount option and skip all that should be ignored IFS="," for OPT in $@; do - OPT=`echo $OPT | sed "s/^\(-o\|user\|nouser\|users\|auto\|noauto\|_netdev\)$/ignore/"` - if [ "$OPT" == "ignore" ]; then continue; fi + OPT=`echo $OPT | sed "s/^\(-o\|user\|nouser\|users\|auto\|noauto\|_netdev\)$/IGNORE/"` + if [ "$OPT" == "IGNORE" ]; then continue; fi OPTIONS="$OPTIONS$OPT," done IFS=" " -- 2.30.2