packages: nagios-nrpe/nrpe.init - use full path in daemon for daemon process

glen glen at pld-linux.org
Tue Feb 9 09:04:59 CET 2010


Author: glen                         Date: Tue Feb  9 08:04:59 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use full path in daemon for daemon process

---- Files affected:
packages/nagios-nrpe:
   nrpe.init (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/nagios-nrpe/nrpe.init
diff -u packages/nagios-nrpe/nrpe.init:1.5 packages/nagios-nrpe/nrpe.init:1.6
--- packages/nagios-nrpe/nrpe.init:1.5	Thu Feb  8 17:01:36 2007
+++ packages/nagios-nrpe/nrpe.init	Tue Feb  9 09:04:52 2010
@@ -30,22 +30,24 @@
 start() {
 	if [ -f /var/lock/subsys/nrpe ]; then
 		msg_already_running "Nagios NRPE daemon"
-	else
-		msg_starting "Nagios NRPE daemon"
-		daemon nrpe -c /etc/nagios/nrpe.cfg -d
-		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/nrpe
+		return
 	fi
+
+	msg_starting "Nagios NRPE daemon"
+	daemon /usr/sbin/nrpe -c /etc/nagios/nrpe.cfg -d
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/nrpe
 }
 
 stop() {
-	if [ -f /var/lock/subsys/nrpe ]; then
-		msg_stopping "Nagios NRPE daemon"
-		killproc --pidfile nrpe/nrpe.pid nrpe
-		rm -f /var/lock/subsys/nrpe
-	else
+	if [ ! -f /var/lock/subsys/nrpe ]; then
 		msg_not_running "Nagios NRPE daemon"
+		return
 	fi
+
+	msg_stopping "Nagios NRPE daemon"
+	killproc --pidfile nrpe/nrpe.pid nrpe
+	rm -f /var/lock/subsys/nrpe
 }
 
 RETVAL=0
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-nrpe/nrpe.init?r1=1.5&r2=1.6&f=u



More information about the pld-cvs-commit mailing list