* [Cluster-devel] [PATCH] resource-agents: Try force-unmount before fuser for netfs.sh
@ 2011-03-22 1:07 Lon Hohberger
2011-03-22 8:34 ` Fabio M. Di Nitto
0 siblings, 1 reply; 2+ messages in thread
From: Lon Hohberger @ 2011-03-22 1:07 UTC (permalink / raw)
To: cluster-devel.redhat.com
RHEL5 only. A completely separate patch is needed for
upstream and RHEL6
Resolves: rhbz#678494
Signed-off-by: Lon Hohberger <lhh@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
^ permalink raw reply related [flat|nested] 2+ messages in thread* [Cluster-devel] [PATCH] resource-agents: Try force-unmount before fuser for netfs.sh
2011-03-22 1:07 [Cluster-devel] [PATCH] resource-agents: Try force-unmount before fuser for netfs.sh Lon Hohberger
@ 2011-03-22 8:34 ` Fabio M. Di Nitto
0 siblings, 0 replies; 2+ messages in thread
From: Fabio M. Di Nitto @ 2011-03-22 8:34 UTC (permalink / raw)
To: cluster-devel.redhat.com
ACK.
Fabio
On 3/22/2011 2:07 AM, Lon Hohberger wrote:
> RHEL5 only. A completely separate patch is needed for
> upstream and RHEL6
>
> Resolves: rhbz#678494
>
> Signed-off-by: Lon Hohberger <lhh@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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-03-22 8:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-22 1:07 [Cluster-devel] [PATCH] resource-agents: Try force-unmount before fuser for netfs.sh Lon Hohberger
2011-03-22 8:34 ` Fabio M. Di Nitto
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).