[Pkg-nagios-changes] [SCM] Debian packaging for nagios nrpe branch, master, updated. debian/2.12-5-9-g6f5ff85

[Alexander Wirt]

The following commit has been merged in the master branch:
commit 4dc53fb87ce2087ae17ea74ec9080155862109bb
Author: Alexander Wirt <formorer at debian.org>
Date:   Mon Apr 30 09:23:28 2012 +0200

    Use retry argument for start-stop-daemon when stopping nrpe
    
    Closes: #650464

diff --git a/debian/nagios-nrpe-server.init b/debian/nagios-nrpe-server.init
index 0dda5f0..c0e62c2 100644
--- a/debian/nagios-nrpe-server.init
+++ b/debian/nagios-nrpe-server.init
@@ -59,14 +59,12 @@ case "$1" in
 	;;
   stop)
 	log_daemon_msg "Stopping $DESC" "$NAME"
-    start-stop-daemon --stop --quiet --oknodo --pidfile $PIDDIR/nrpe.pid
+	start-stop-daemon --stop --quiet --oknodo --pidfile $PIDDIR/nrpe.pid --retry 15
 	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 --pidfile $PIDDIR/nrpe.pid
+	start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDDIR/nrpe.pid
 	log_end_msg $?
 	;;
   status)

-- 
Debian packaging for nagios nrpe