X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fntp%2Ffiles%2Fntp.init;fp=modules%2Fntp%2Ffiles%2Fntp.init;h=9074e5b471139623e99dc83be412ed14572ed72c;hb=76ca91bce24ecbcbcc4e62a37aa06fd0fb9f96c7;hp=6a2bfe86ea611dedbb9a7a3cd0b24f9ebc41de21;hpb=46cee04ab06b23ab6e9e4baba655cf470d10cfc4;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ntp/files/ntp.init b/modules/ntp/files/ntp.init
index 6a2bfe86e..9074e5b47 100755
--- a/modules/ntp/files/ntp.init
+++ b/modules/ntp/files/ntp.init
@@ -22,27 +22,12 @@ if [ -r /etc/default/ntp ]; then
 	. /etc/default/ntp
 fi
 
-if [ -e /var/lib/ntp/ntp.conf.dhcp ]; then
-	NTPD_OPTS="$NTPD_OPTS -c /var/lib/ntp/ntp.conf.dhcp"
+if [ -e /run/ntp.conf.dhcp ]; then
+	NTPD_OPTS="$NTPD_OPTS -c /run/ntp.conf.dhcp"
 fi
 
 
-LOCKFILE=/var/lock/ntpdate
-
-lock_ntpdate() {
-	if [ -x /usr/bin/lockfile-create ]; then
-		lockfile-create $LOCKFILE
-		lockfile-touch $LOCKFILE &
-		LOCKTOUCHPID="$!"
-	fi
-}
-
-unlock_ntpdate() {
-	if [ -x /usr/bin/lockfile-create ] ; then
-		kill $LOCKTOUCHPID
-		lockfile-remove $LOCKFILE
-	fi
-}
+LOCKFILE=/run/lock/ntpdate
 
 RUNASUSER=ntp
 UGID=$(getent passwd $RUNASUSER | cut -f 3,4 -d:) || true
@@ -57,15 +42,15 @@ case $1 in
 			log_failure_msg "user \"$RUNASUSER\" does not exist"
 			exit 1
 		fi
-		lock_ntpdate
-  		start-stop-daemon --start --quiet --oknodo --pidfile $PIDFILE --startas $DAEMON -- -p $PIDFILE $NTPD_OPTS
-		status=$?
-		unlock_ntpdate
-		log_end_msg $status
+		(
+			flock -w 180 9
+			start-stop-daemon --start --quiet --oknodo --pidfile $PIDFILE --startas $DAEMON -- -p $PIDFILE $NTPD_OPTS
+		) 9>$LOCKFILE
+		log_end_msg $?
   		;;
 	stop)
 		log_daemon_msg "Stopping NTP server" "ntpd"
-		start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE --retry 5
+		start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE --retry=TERM/30/KILL/5 --exec $DAEMON
 		log_end_msg $?
 		rm -f $PIDFILE
   		;;