SOURCES: nagios-nsca.init - init file fixes

[havner]

Author: havner                       Date: Tue Aug  9 11:28:00 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- init file fixes

---- Files affected:
SOURCES:
   nagios-nsca.init (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/nagios-nsca.init
diff -u SOURCES/nagios-nsca.init:1.1 SOURCES/nagios-nsca.init:1.2
--- SOURCES/nagios-nsca.init:1.1	Mon Aug  8 14:42:11 2005
+++ SOURCES/nagios-nsca.init	Tue Aug  9 13:27:54 2005
@@ -34,14 +34,13 @@
 case "$1" in
   start)
 	# Check if the service is already running?
-	if [ ! -f /var/lock/subsys/nagios-nsca ]; then
+	if [ -f /var/lock/subsys/nagios-nsca ]; then
+		msg_already running "nagios NSCA daemon"
+	else
 		msg_starting "nagios NSCA daemon"
-		su - nagios -s /bin/sh -c '/usr/bin/setsid /usr/lib/nagios/nsca -d /etc/nagios/nsca.cfg </dev/null >/dev/null 2>&1'
-		[ $? -ne 0 ] && RETVAL=1
+		dameon nsca -c /etc/nagios/nsca.cfg
+		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/nagios-nsca
-		[ $RETVAL -eq 0 ] && ok || fail
-	else
-		msg_already_running "nagios NSCA daemon"
 	fi
 	;;
   stop)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/nagios-nsca.init?r1=1.1&r2=1.2&f=u