diff options
| author |  Miklos Szeredi <miklos@szeredi.hu> | 2006-10-28 07:59:22 +0000 |
|---|---|---|
| committer | Miklos Szeredi <miklos@szeredi.hu> | 2006-10-28 07:59:22 +0000 |
| commit | 10d03ed9c381436d06252ab440bc2e910e7e755b (patch) | |
| tree | 13fe3b8295e89b100b825bfd533cbc2e332e439d /util | |
| parent | e414a2ff2cc5ba3bf618a3674a0a0a8408ad0470 (diff) | |
build/install fixes + add bug reporting instructions to README
Diffstat (limited to 'util')
| -rw-r--r-- | util/Makefile.am | 12 | ||||
| -rw-r--r-- | util/mount.fuse | 13 |
2 files changed, 12 insertions, 13 deletions
diff --git a/util/Makefile.am b/util/Makefile.am index 6572afe..dcd69f6 100644 --- 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 1e1a2b4..0b111db 100644 --- 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} |