rgmanager: master - rgmanager: improve init script

rgmanager: master - rgmanager: improve init script

[Fabio M. Di Nitto]

Gitweb:        http://git.fedorahosted.org/git/rgmanager.git?p=rgmanager.git;a=commitdiff;h=d5fcfa41fa87ef11f331510cfedd4dae7a1e0eab
Commit:        d5fcfa41fa87ef11f331510cfedd4dae7a1e0eab
Parent:        be3bc0917531590a165adcea89ccd82a50c2db22
Author:        Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate:    Fri Jan 9 12:09:52 2009 +0100
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Fri Jan 9 13:58:44 2009 +0100

rgmanager: improve init script

based on Marian Marinov submission for gfs2 init script,
simplify the init script distro overrides to make the script
easily readable again and also easier to write.

Set also a secure PATH.

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

diff --git a/rgmanager/init.d/rgmanager.in b/rgmanager/init.d/rgmanager.in
index 2a3a30c..697e66b 100644
--- a/rgmanager/init.d/rgmanager.in
+++ b/rgmanager/init.d/rgmanager.in
@@ -13,15 +13,34 @@
 # Description:		Starts and stops Red Hat Service (resource group) Manager
 ### END INIT INFO
 
+success()
+{
+    echo -ne "[  OK  ]\r"
+}
+
+failure()
+{
+    echo -ne "[FAILED]\r"
+}
+
+status()
+{
+    pid=$(pidof $1 2>/dev/null)
+    rtrn=$?
+    if [ $rtrn -ne 0 ]; then
+        echo "$1 is stopped"
+    else
+        echo "$1 (pid $pid) is running..."
+    fi
+    return $rtrn
+}
+
 # rpm based distros
 if [ -d /etc/sysconfig ]; then
 	[ -f @INITDDIR@/functions ] && . @INITDDIR@/functions
 	[ -f /etc/sysconfig/cluster ] && . /etc/sysconfig/cluster
 	[ -f /etc/sysconfig/rgmanager ] && . /etc/sysconfig/rgmanager
 	[ -z "$LOCK_FILE" ] && LOCK_FILE="/var/lock/subsys/rgmanager"
-	success=success
-	failure=failure
-	status=status
 fi
 
 # deb based distros
@@ -29,12 +48,9 @@ if [ -d /etc/default ]; then
 	[ -f /etc/default/cluster ] && . /etc/default/cluster
 	[ -f /etc/default/rgmanager ] && . /etc/default/rgmanager
 	[ -z "$LOCK_FILE" ] && LOCK_FILE="/var/lock/rgmanager"
-	success=local_success
-	failure=local_failure
-	status=local_status
 fi
 
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:@SBINDIR@
 
 export PATH
 
@@ -46,28 +62,6 @@ LOG_WARNING=4
 LOG_NOTICE=5
 LOG_INFO=6
 
-local_success()
-{
-    echo -ne "[  OK  ]\r"
-}
-
-local_failure()
-{
-    echo -ne "[FAILED]\r"
-}
-
-local_status()
-{
-    pid=$(pidof $1 2>/dev/null)
-    rtrn=$?
-    if [ $rtrn -ne 0 ]; then
-        echo "$1 is stopped"
-    else
-        echo "$1 (pid $pid) is running..."
-    fi
-    return $rtrn
-}
-
 #
 # log_and_print <level> <message>
 #
@@ -98,7 +92,7 @@ stop_cluster()
 			while [ -n "`pidof $RGMGRD`" ]; do
 				sleep 1
 			done
-			$success
+			success
 			echo
 		else
 			echo "Services are stopped."
@@ -128,9 +122,9 @@ case $1 in
 		rtrn=$?
 		if [ $rtrn = 0 ]; then
 			touch $LOCK_FILE
-			$success
+			success
 		else
-			$failure
+			failure
 		fi
 		echo
 
@@ -158,9 +152,9 @@ case $1 in
 		kill -HUP $(pidof $RGMGRD) 2>&1
 		rtrn=$?
 		if [ $rtrn = 0 ]; then
-			$success
+			success
 		else
-			$failure
+			failure
 		fi
 		echo
 
@@ -168,7 +162,7 @@ case $1 in
 		;;
 
 	status)
-		$status $RGMGRD
+		status $RGMGRD
 		exit $?
 		;;