From 00d596fb439d9c3aff6c6d06448b194681333d46 Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Wed, 25 Apr 2007 12:32:47 +0000
Subject: 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

---
 sh/rc-mount.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'sh')

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
-- 
cgit v1.2.3