cluster: RHEL4 - resource-agents: Fix magma_tool return code checking

Lon Hohberger lon at fedoraproject.org
Thu Oct 21 22:11:32 UTC 2010


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=65a091eb4fe190cf1063c1f6d3e559cd1a836e7c
Commit:        65a091eb4fe190cf1063c1f6d3e559cd1a836e7c
Parent:        44a5db04457aa4003f551b0debf2bb0a996d8e99
Author:        Eduardo Damato <edamato at redhat.com>
AuthorDate:    Thu Oct 21 18:08:16 2010 -0400
Committer:     Lon Hohberger <lhh at redhat.com>
CommitterDate: Thu Oct 21 18:09:22 2010 -0400

resource-agents: Fix magma_tool return code checking

Resolves: rhbz#516758

Reviewed-by: Lon Hohberger <lhh at redhat.com>
---
 rgmanager/src/resources/utils/member_util.sh |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/rgmanager/src/resources/utils/member_util.sh b/rgmanager/src/resources/utils/member_util.sh
index 695c8da..4026e59 100644
--- a/rgmanager/src/resources/utils/member_util.sh
+++ b/rgmanager/src/resources/utils/member_util.sh
@@ -69,6 +69,12 @@ local_node_name()
 	if which magma_tool &> /dev/null; then
 		# Use magma_tool, if available.
 		line=$(magma_tool localname | grep "^Local")
+		res=$?
+
+		if [ $res -ne 0  ]; then
+			# magma_tool failed.
+			return 2
+		fi
 
 		if [ -n "$line" ]; then
 			echo ${line/* = /}


More information about the cluster-commits mailing list