cluster: STABLE3 - cman init: make output a lot more complete

cluster: STABLE3 - cman init: make output a lot more complete

[Fabio M. Di Nitto]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=70734a6dc833c13519151c2315d380ca9bdec006
Commit:        70734a6dc833c13519151c2315d380ca9bdec006
Parent:        795a8720eb1cffdf405500c41a2d17666fb9053a
Author:        Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate:    Wed Mar 25 13:32:41 2009 +0100
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Fri Mar 27 20:05:45 2009 +0100

cman init: make output a lot more complete

make sure to notify when we do not start or start things
instead of expecting users to know that should happen.

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
 cman/init.d/cman.in |   41 +++++++++++++++++++++++++++--------------
 1 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index 3b38ca5..6184058 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -285,19 +285,14 @@ start_cman()
 
 unfence_self()
 {
-	echo -n "   Unfencing self... "
 	fence_node -U > /dev/null 2>&1
 
 	case $? in
-		0)
-			ok
-		;;
 		1)
-			nok
+			return 1
 		;;
 		2)
-			echo -n "unconfigured"
-			ok
+			echo -n "unconfigured/unrequired"
 		;;
 	esac
 	return 0
@@ -414,13 +409,16 @@ start()
 	# required for distributions that use tmpfs for /var/run
 	mkdir -p /var/run/cluster
 
+	echo -n "   Enable Xend bridge net workaround... "
 	if xend_bridged_net_enabled; then
-		echo -n "   Enabling workaround for Xend bridged networking... "
 		if xend_bridged_net_start; then
 			ok
 		else
 			nok
 		fi
+	else
+		echo -n "not required"
+		ok
 	fi
 
 	echo -n "   Loading modules... "
@@ -451,7 +449,12 @@ start()
 		nok
 	fi
 
-	unfence_self || return 1
+	echo -n "   Unfencing self... "
+	if unfence_self; then
+		ok
+	else
+		nok
+	fi
 
 	echo -n "   Starting qdiskd... "
 	if start_qdiskd; then
@@ -467,22 +470,28 @@ start()
 		nok
 	fi
 
+	echo -n "   Starting fencing... "
 	if fence_join_enabled; then
-		echo -n "   Starting fencing... "
 		if start_fence; then
 			ok
 		else
 			nok
 		fi
+	else
+		echo -n "not required"
+		ok
 	fi
 
+	echo -n "   Starting virtual machine fencing host... "
 	if fence_xvmd_enabled; then
-		echo -n "   Starting virtual machine fencing host... "
 		if start_fence_xvmd; then
 			ok
 		else
 			nok
 		fi
+	else
+		echo -n "not required"
+		ok
 	fi
     
 	return 0
@@ -579,22 +588,26 @@ stop()
 {
 	echo "Stopping cluster: "
 
+	echo -n "   Stopping virtual machine fencing host... "
 	if fence_xvmd_enabled; then
-		echo -n "   Stopping virtual machine fencing host... "
 		if stop_fence_xvmd; then
 			ok
 		else
 			nok
 		fi
+	else
+		ok
 	fi
 
+	echo -n "   Stopping fencing... "
 	if fence_join_enabled; then
-		echo -n "   Stopping fencing... "
 		if stop_fence; then
 			ok
 		else
 			nok
 		fi
+	else
+		ok
 	fi
 
 	echo -n "   Stopping daemons... "
@@ -604,7 +617,7 @@ stop()
 		nok
 	fi
 
-	echo -n "   Stopping the Quorum Disk Daemon: "
+	echo -n "   Stopping qdiskd... "
 	if stop_qdiskd; then
 		ok
 	else