[Cluster-devel] [PATCH] resource-agents: Try force-unmount before fuser for netfs.sh

[Lon Hohberger]

RHEL5 only.  A completely separate patch is needed for
upstream and RHEL6

Resolves: rhbz#678494

Signed-off-by: Lon Hohberger <lhh at redhat.com>
---
 rgmanager/src/resources/netfs.sh |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/rgmanager/src/resources/netfs.sh b/rgmanager/src/resources/netfs.sh
index 1a669d3..837a4c4 100755
--- a/rgmanager/src/resources/netfs.sh
+++ b/rgmanager/src/resources/netfs.sh
@@ -486,6 +486,7 @@ stopNFSFilesystem() {
 	typeset no_umount=""
 	typeset force_umount=""
 	typeset fstype=""
+	typeset umount_flag=""
 
 
 	#
@@ -558,7 +559,7 @@ stopNFSFilesystem() {
 			sync; sync; sync
 			ocf_log info "unmounting $mp"
 
-                        umount $mp
+                        umount $umount_flag $mp
 			if  [ $? -eq 0 ]; then
                                 umount_failed=
                                 done=$YES
@@ -568,6 +569,10 @@ stopNFSFilesystem() {
 			umount_failed=yes
 
 			if [ "$force_umount" ]; then
+				if [ -z "$umount_flag" ]; then
+					umount_flag="-f"
+					continue
+				fi
 				if [ $try -eq 1 ]; then
 					fuser -TERM -kvm "$mp"
 				else
-- 
1.7.3.4