Merge remote-tracking branch 'origin/master' into staging

[mirror/dsa-puppet.git] / modules / ntp / files / ntp.init

diff --git a/modules/ntp/files/ntp.init b/modules/ntp/files/ntp.init
index 6a2bfe8..9074e5b 100755 (executable)
--- 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
                ;;