aboutsummaryrefslogtreecommitdiff
path: root/sh/rc-mount.sh
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2007-04-25 12:32:47 +0000
committerRoy Marples <roy@marples.name>2007-04-25 12:32:47 +0000
commit00d596fb439d9c3aff6c6d06448b194681333d46 (patch)
treef6178f22d594b5bab8559c21de26c9033b8d50c8 /sh/rc-mount.sh
parentdfc208bd25288dd09d531f3e0665274bb9cf2998 (diff)
Fix Makefile to clean and remove .svn when making dist. rc-mount no longer appends -f for linux mount and uses -i instead to ignore helpers
Diffstat (limited to 'sh/rc-mount.sh')
-rw-r--r--sh/rc-mount.sh10
1 files changed, 8 insertions, 2 deletions
diff --git a/sh/rc-mount.sh b/sh/rc-mount.sh
index 67ea203f..2084911d 100644
--- a/sh/rc-mount.sh
+++ b/sh/rc-mount.sh
@@ -52,8 +52,14 @@ do_unmount() {
# OK, try forcing things
if [ ${retry} -le 0 ] ; then
- ${cmd} -f "${mnt}" || retry=-999
- retry=-999
+ local extra_opts="-f"
+ case "${cmd}" in
+ mount*)
+ # Silly reiserfs helper blocks us, so bypass it
+ [ "${RC_UNAME}" = "Linux" ] && extra_opts="-i"
+ ;;
+ esac
+ ${cmd} ${extra_opts} "${mnt}" || retry=-999
break
fi
done