From f1ef82272bcfa039d91cc4d5034a202dadd8bbda Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Mon, 24 Jan 2011 17:22:01 +0000
Subject: [PATCH] - unify, cleanups

Changed files:
    cvsnt-cvslockd.init -> 1.5
---
 cvsnt-cvslockd.init | 55 ++++++++++++++++++---------------------------
 1 file changed, 22 insertions(+), 33 deletions(-)

diff --git a/cvsnt-cvslockd.init b/cvsnt-cvslockd.init
index 732a3ce..28205a6 100644
--- a/cvsnt-cvslockd.init
+++ b/cvsnt-cvslockd.init
@@ -19,64 +19,53 @@ fi
 
 start() {
 	# Start daemons.
-	if [ ! -f /var/lock/subsys/cvslockd ]; then
-		msg_starting cvslockd
-		daemon cvslockd
-		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/cvslockd
-	else
-		msg_already_running cvslockd
+	if [ -f /var/lock/subsys/cvslockd ]; then
+		msg_already_running "cvslockd"
+		return
 	fi
+
+	msg_starting "cvslockd"
+	daemon /usr/bin/cvslockd
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/cvslockd
 }
 
 stop() {
 	# Stop daemons.
-	if [ -f /var/lock/subsys/cvslockd ]; then
-		msg_stopping cvslockd
-		killproc cvslockd
-		rm -f /var/lock/subsys/cvslockd >/dev/null 2>&1
-	else
-		msg_not_running cvslockd
+	if [ ! -f /var/lock/subsys/cvslockd ]; then
+		msg_not_running "cvslockd"
+		return
 	fi
-}
 
-reload() {
-	if [ -f /var/lock/subsys/cvslockd ]; then
-		msg_reloading cvslockd
-		killproc cvslockd -HUP
-		RETVAL=$?
-	else
-		msg_not_running cvslockd
-		RETVAL=7
-	fi
+	msg_stopping "cvslockd"
+	killproc cvslockd
+	rm -f /var/lock/subsys/cvslockd >/dev/null 2>&1
 }
 
 condrestart() {
-	if [ -f /var/lock/subsys/cvslockd ]; then
-		stop
-		start
-	else
-		msg_not_running cvslockd
+	if [ ! -f /var/lock/subsys/cvslockd ]; then
+		msg_not_running "cvslockd"
 		RETVAL=$1
+		return
 	fi
+
+	stop
+	start
 }
 
 RETVAL=0
 # See how we were called.
 case "$1" in
   start)
-  	start
+	start
 	;;
   stop)
-  	stop
+	stop
 	;;
   restart)
 	stop
 	start
 	;;
-#  reload|force-reload)
-#  	reload
-#	;;
   try-restart)
 	condrestart 0
 	;;
-- 
2.44.0