[Pkg-nagios-changes] [SCM] Debian packaging for nagios nrpe branch, master, updated. upstream/2.12-19-g3786d19

[Alexander Wirt]

The following commit has been merged in the master branch:
commit e776f7b29d69e0d9ba3fd5f83f0f1d94e3b94d05
Author: Alexander Wirt <formorer at debian.org>
Date:   Mon Sep 12 22:11:19 2011 +0200

    Use pidfile for start-stop-daemon and fix pidfile deletion
    
    Closes: #548157, #639523

diff --git a/debian/nagios-nrpe-server.init b/debian/nagios-nrpe-server.init
index 9979cdc..56f7bf1 100644
--- a/debian/nagios-nrpe-server.init
+++ b/debian/nagios-nrpe-server.init
@@ -46,8 +46,6 @@ if [ ! -d "$PIDDIR" ]; then
 	chown nagios "$PIDDIR"
 fi
 
-test -e $PIDDIR/nrpe.pid && rm $PIDDIR/nrpe.pid
-
 set -e
 
 case "$1" in
@@ -61,12 +59,14 @@ case "$1" in
 	;;
   stop)
 	log_daemon_msg "Stopping $DESC" "$NAME"
-	start-stop-daemon --stop --quiet --oknodo --exec $DAEMON
+    start-stop-daemon --stop --quiet --oknodo --pidfile $PIDDIR/nrpe.pid
 	log_end_msg $?
+    #sometimes deleting the pidfile fails. cleanup afterwards.
+    test -e $PIDDIR/nrpe.pid && rm $PIDDIR/nrpe.pid
 	;;
   reload|force-reload)
 	log_daemon_msg "Reloading $DESC configuration files" "$NAME"
-	start-stop-daemon --stop --signal HUP --quiet --exec $DAEMON
+    start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDDIR/nrpe.pid
 	log_end_msg $?
 	;;
   restart)

-- 
Debian packaging for nagios nrpe