build/install fixes + add bug reporting instructions to README

diff --git a/ChangeLog b/ChangeLog
index 82b5a3f7408944a14c7fdc060f14d7c96efe01f1..5e0b3001701f6663b2be71373346bf120fcca2e3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2006-10-28  Miklos Szeredi <miklos@szeredi.hu>
+
+       * Fix automake problem.  Patch from Nix
+
+2006-10-26  Miklos Szeredi <miklos@szeredi.hu>
+
+       * Fix mount.fuse to use /bin/sh instead of /bin/bash, which is not
+       always available on embedded systems.  Patch from Paul Smith
+
+       * Fix util/Makefile.am, so that failure to run update-rc.d or
+       device creation doesn't cause make to fail.  Reported by Paul
+       Smith
+
 2006-10-21  Miklos Szeredi <miklos@szeredi.hu>
 
        * Released 2.6.0

diff --git a/README b/README
index b97d56b4c145f5dc573af98aa1b2e156dbbaa5b5..da06a2a91c92ae1d34a61be189b2303ec55438d6 100644 (file)
--- a/README
+++ b/README
@@ -126,6 +126,12 @@ user_allow_other
 Mount options
 =============
 
+Most of the generic mount options described in 'man mount' are
+supported (ro, rw, suid, nosuid, dev, nodev, exec, noexec, atime,
+noatime, sync async, dirsync).  Filesystems are mounted with
+'-onodev,nosuid' by default, which can only be overridden by a
+privileged user.
+
 These are FUSE specific mount options that can be specified for all
 filesystems:
 
@@ -264,3 +270,12 @@ blkdev
 
   Mount a filesystem backed by a block device.  This is a privileged
   option.  The device must be specified with the 'fsname=NAME' option.
+
+
+Reporting bugs
+==============
+
+Please send bug reports to the <fuse-devel@lists.sourceforge.net>
+mailing list.
+
+The list is open, you need not be subscribed to post.

diff --git a/configure.in b/configure.in
index b9a88286004f821564a11a38b49855eeba57a9a7..6e32d0499419c978e9335447a98d6f4622d088c2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,6 +5,7 @@ AM_CONFIG_HEADER(include/config.h)
 
 AC_PROG_LIBTOOL
 AC_PROG_CC
+AM_PROG_CC_C_O
 
 # compatibility for automake < 1.8
 if test -z "$mkdir_p"; then

diff --git a/util/Makefile.am b/util/Makefile.am
index 6572afe8c1869c90ad91403465922559b328d11b..dcd69f6bc0b310c37d39532c5644064351698538 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -14,8 +14,8 @@ install-exec-hook:
        -chmod u+s $(DESTDIR)$(bindir)/fusermount
        @if test ! -e $(DESTDIR)/dev/fuse; then \
                $(mkdir_p) $(DESTDIR)/dev; \
-               echo "mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229"; \
-               mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229; \
+               echo "mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229 || true"; \
+               mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229 || true; \
        fi
 
 EXTRA_DIST = mount.fuse udev.rules init_script
@@ -30,8 +30,8 @@ install-exec-local:
        $(mkdir_p) $(DESTDIR)$(INIT_D_PATH)
        $(INSTALL_PROGRAM) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse
        @if test -x /usr/sbin/update-rc.d; then \
-               echo "/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 ."; \
-               /usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 .; \
+               echo "/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true"; \
+               /usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true; \
        fi
 
 install-data-local:
@@ -43,6 +43,6 @@ uninstall-local:
        rm -f $(DESTDIR)$(UDEV_RULES_PATH)/99-fuse.rules
        rm -f $(DESTDIR)$(INIT_D_PATH)/fuse
        @if test -x /usr/sbin/update-rc.d; then \
-               echo "/usr/sbin/update-rc.d fuse remove"; \
-               /usr/sbin/update-rc.d fuse remove; \
+               echo "/usr/sbin/update-rc.d fuse remove || true"; \
+               /usr/sbin/update-rc.d fuse remove || true; \
        fi

diff --git a/util/mount.fuse b/util/mount.fuse
index 1e1a2b4ce423f6015772abdb8b38fd68aa9cfab7..0b111db399868ad002343a940dd130f5313fdc11 100644 (file)
--- a/util/mount.fuse
+++ b/util/mount.fuse
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 # FUSE mount helper
 # Petr Klima <qaxi@seznam.cz>
@@ -28,15 +28,14 @@ function die {
 
 [ "$#" -ge 2 ] || die "${USAGE}"
 
-FSTYPE=${1%%\#*} # for now i have to be same as FUSE mount binary
-                # should be configurable
+# for now i have to be same as FUSE mount binary
+# should be configurable
+eval `echo "$1" | sed -n 's,\(^[^#][^#]*\)\(#\(.*\)\)*,FSTYPE="\1" MOUNTPATH="\3",p'`
 
 export PATH
 FSBIN=`which ${FSTYPE} 2>/dev/null` \
        || die "Can not find FUSE mount binary for FS ${FSTYPE}" 1
 
-MOUNTPATH=${1#*#}
-
 # was there an # in $1
 [ "$1" = "$MOUNTPATH" ] && MOUNTPATH=""
 
@@ -46,8 +45,8 @@ MOUNTPOINT="$2"
 shift
 shift
 
-ignore_opts="(user|nouser|users|auto|noauto|_netdev)"
+ignore_opts='\(user\|nouser\|users\|auto\|noauto\|_netdev\)'
 
-OPTIONS=`echo $@ | sed -r "s/(,${ignore_opts}|${ignore_opts},)//g"`
+OPTIONS=`echo $@ | sed "s/,${ignore_opts}\|${ignore_opts},//g"`
 
 ${FSTYPE} ${MOUNTPATH} ${MOUNTPOINT} ${OPTIONS}