cluster: STABLE3 - cman init: make init script LSB compliant

Fabio M. Di Nitto fabbione at fedoraproject.org
Tue Nov 24 07:42:43 UTC 2009


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=506f14733f529f74662f01eef093f60a66dbff1d
Commit:        506f14733f529f74662f01eef093f60a66dbff1d
Parent:        df7a30d84a4f8b9b645bdef52731491e60e590b8
Author:        Fabio M. Di Nitto <fdinitto at redhat.com>
AuthorDate:    Tue Nov 24 08:40:08 2009 +0100
Committer:     Fabio M. Di Nitto <fdinitto at redhat.com>
CommitterDate: Tue Nov 24 08:40:08 2009 +0100

cman init: make init script LSB compliant

Fix rhbz#537242

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

diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index e864acf..5f559f9 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -861,35 +861,35 @@ stop()
 cmanstatus()
 {
 	if fence_xvmd_standalone; then
-		errmsg=$( status fence_xvmd 2>&1 ) || return 1
-		return 0
+		errmsg=$( status fence_xvmd 2>&1 )
+		return $?
 	fi
 
-	errmsg=$( status corosync 2>&1 ) || return 1
+	errmsg=$( status corosync 2>&1 ) || return $?
 
 	if ! cman_running; then
 		errmsg="cman is not running"
-		return 1
+		return 3
 	fi
 
 	if qdiskd_enabled; then
-		errmsg=$( status qdiskd 2>&1 ) || return 1
+		errmsg=$( status qdiskd 2>&1 ) || return $?
 	fi
 
 	if groupd_enabled; then
-		errmsg=$( status groupd 2>&1 ) || return 1
+		errmsg=$( status groupd 2>&1 ) || return $?
 	fi
 
-	errmsg=$( status fenced 2>&1 ) || return 1
-	errmsg=$( status dlm_controld 2>&1 ) || return 1
-	errmsg=$( status gfs_controld 2>&1 ) || return 1
+	errmsg=$( status fenced 2>&1 ) || return $?
+	errmsg=$( status dlm_controld 2>&1 ) || return $?
+	errmsg=$( status gfs_controld 2>&1 ) || return $?
 
 	if cmannotifyd_enabled; then
-		errmsg=$( status cmannotifyd 2>&1 ) || return 1
+		errmsg=$( status cmannotifyd 2>&1 ) || return $?
 	fi
 
 	if fence_xvmd_enabled; then
-		errmsg=$( status fence_xvmd 2>&1 ) || return 1
+		errmsg=$( status fence_xvmd 2>&1 ) || return $?
 	fi
 }
 
@@ -917,8 +917,17 @@ restart|reload|force-reload)
 	stop
 	start
 ;;
-status)
+condrestart|try-restart)
 	if cmanstatus; then
+		cmanremove=remove
+		stop
+		start
+	fi
+;;
+status)
+	cmanstatus
+	rtrn=$?
+	if [ "$rtrn" = 0 ]; then
 		if fence_xvmd_standalone; then
 			echo "fence_xvmd standalone is running."
 		else
@@ -926,12 +935,11 @@ status)
 		fi
 	else
 		echo "$errmsg"
-		rtrn=1
 	fi
 ;;
 *)
 	echo "Usage: $0 {start|stop|reload|restart|status}"
-	rtrn=1
+	rtrn=2
 ;;
 esac
 


More information about the cluster-commits mailing list