From: Julien Cristau <jcristau@debian.org>
Date: Sun, 17 May 2015 14:30:56 +0000 (+0200)
Subject: Make ntp init script correctly stop the service
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=dbd72ada16ba1ad58aea1adc7dba721e7e925369;p=mirror%2Fdsa-puppet.git

Make ntp init script correctly stop the service

Tell start-stop-daemon to wait for it to exit, and retry with KILL if
TERM isn't enough.

Signed-off-by: Julien Cristau <jcristau@debian.org>
---

diff --git a/modules/ntp/files/ntp.init b/modules/ntp/files/ntp.init
index 3a5ccc5d0..6a2bfe86e 100755
--- a/modules/ntp/files/ntp.init
+++ b/modules/ntp/files/ntp.init
@@ -65,7 +65,7 @@ case $1 in
   		;;
 	stop)
 		log_daemon_msg "Stopping NTP server" "ntpd"
-  		start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE
+		start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE --retry 5
 		log_end_msg $?
 		rm -f $PIDFILE
   		;;