cluster: STABLE3 - cman init: readd support for fence_xvmd standalone operations

["Fabio M. Di Nitto" <fabbione@fedoraproject.org>]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=8bd2da7c40ffc74f8ec8c0d0026b1ae1936611c1
Commit:        8bd2da7c40ffc74f8ec8c0d0026b1ae1936611c1
Parent:        87076cf3354bdacdabe9fddf9b43b6080e33bca0
Author:        Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate:    Tue Jun 30 12:12:20 2009 +0200
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Tue Jun 30 12:12:20 2009 +0200

cman init: readd support for fence_xvmd standalone operations

for some reason this patch was lost. Readd it.

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

diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index 7e55705..e48300d 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -640,6 +640,12 @@ start()
 
 	echo $echoarg "Starting cluster: "
 
+	runwrap start_fence_xvmd \
+		fence_xvmd_standalone \
+		"Starting virtual machine fencing host (standalone)"
+
+	fence_xvmd_standalone && exit 0
+
 	runwrap start_global \
 		none \
 		"Global setup"
@@ -710,6 +716,12 @@ stop()
 	echo $echoarg "Stopping cluster: "
 
 	runwrap stop_fence_xvmd \
+		fence_xvmd_standalone \
+		"Stopping virtual machine fencing host (standalone)"
+
+	fence_xvmd_standalone && exit 0
+
+	runwrap stop_fence_xvmd \
 		fence_xvmd_enabled \
 		"Stopping virtual machine fencing host"
 
@@ -756,6 +768,11 @@ stop()
 
 cmanstatus()
 {
+	if fence_xvmd_standalone; then
+		errmsg=$( status fence_xvmd 2>&1 ) || return 1
+		return 0
+	fi
+
 	errmsg=$( status corosync 2>&1 ) || return 1
 
 	if ! cman_running; then
@@ -810,7 +827,11 @@ restart|reload)
 ;;
 status)
 	if cmanstatus; then
-		echo "cluster is running."
+		if fence_xvmd_standalone; then
+			echo "fence_xvmd standalone is running."
+		else
+			echo "cluster is running."
+		fi
 	else
 		echo $errmsg
 		rtrn=1