MFC r280849,280915-280916,281015-281016,282097,282408,282415,283542,

     284864,285169-285170,285435:

ntp 4.2.8p3.

Relnotes:	yes
Approved by:	re (?)

6 files changed, 177 insertions, 0 deletions

diff --git a/contrib/ntp/scripts/rc/README b/contrib/ntp/scripts/rc/README
new file mode 100644
index 0000000..f5b82bc
--- /dev/null
+++ b/contrib/ntp/scripts/rc/README
@@ -0,0 +1,13 @@
+This directory contains some example rc scripts for ntpd.
+
+In general, ntpd should be started as soon as possible in the boot process. If
+any services require stable system clock, the ntpwait script should be run
+before them as late as possible.
+
+The rc.d contains scripts for systems using rc.d init system (originated in
+NetBSD). If a service requires stable system time, indicate it with TIMESYNC
+dependency and set ntpwait_enable to YES.
+
+For SysV init systems, you'll have to create links as /etc/rc2.d/S20ntpd and
+/etc/rc2.d/S80ntpwait yourself. (The numbers are just examples, try to give
+ntpd as much time as possible to synchronize before running ntpwait).
diff --git a/contrib/ntp/scripts/rc/ntpd b/contrib/ntp/scripts/rc/ntpd
new file mode 100644
index 0000000..9896247
--- /dev/null
+++ b/contrib/ntp/scripts/rc/ntpd
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+NTPD=/usr/sbin/ntpd
+PIDFILE=/var/run/ntpd.pid
+USER=ntp
+GROUP=ntp
+NTPD_OPTS="-g -u $USER:$GROUP -p $PIDFILE"
+
+ntpd_start() {
+    if [ -r $PIDFILE ]; then
+        echo "ntpd seems to be already running under pid `cat $PIDFILE`."
+        echo "Delete $PIDFILE if this is not the case.";
+        return 1;
+    fi
+    echo -n "Starting NTP daemon... "
+
+    $NTPD $NTPD_OPTS
+
+    # You can't always rely on the ntpd exit code, see Bug #2420
+    # case "$?" in
+    #     0) echo "OK!"
+    #         return 0;;
+    #     *) echo "FAILED!"
+    #         return 1;;
+    # esac
+
+    sleep 1
+
+    if ps -Ao args|grep -q "^$NTPD $NTPD_OPTS"; then
+        echo "OK!"
+        return 0
+    else
+        echo "FAILED!"
+        [ -e $PIDFILE ] && rm $PIDFILE
+        return 1
+    fi
+}
+
+ntpd_stop() {
+    if [ ! -r $PIDFILE ]; then
+        echo "ntpd doesn't seem to be running, cannot read the pid file."
+        return 1;
+    fi
+    echo -n "Stopping NTP daemon...";
+    PID=`cat $PIDFILE`
+
+    if kill -TERM $PID 2> /dev/null;then
+        # Give ntp 15 seconds to exit
+        for i in `seq 1 15`; do
+            if [ -n "`ps -p $PID|grep -v PID`" ]; then
+                echo -n .
+                sleep 1
+            else
+                echo " OK!"
+                rm $PIDFILE
+                return 0
+            fi
+        done
+    fi
+
+    echo " FAILED! ntpd is still running";
+    return 1
+}
+
+ntpd_status() {
+    if [ -r $PIDFILE ]; then
+        echo "NTP daemon is running as `cat $PIDFILE`"
+    else
+        echo "NTP daemon is not running"
+    fi
+}
+
+case "$1" in
+    'start')
+        ntpd_start
+        ;;
+    'stop')
+        ntpd_stop
+        ;;
+    'restart')
+        ntpd_stop && ntpd_start
+        ;;
+    'status')
+        ntpd_status
+        ;;
+    *)
+        echo "Usage: $0 (start|stop|restart|status)"
+esac
diff --git a/contrib/ntp/scripts/rc/ntpwait b/contrib/ntp/scripts/rc/ntpwait
new file mode 100644
index 0000000..2542b2a
--- /dev/null
+++ b/contrib/ntp/scripts/rc/ntpwait
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+NTPWAIT=/usr/sbin/ntpwait
+
+ntpwait_start() {
+    $NTPWAIT -v
+}
+
+case "$1" in
+    'start')
+        ntpwait_start
+        ;;
+    *)
+        echo "Usage: $0 (start)"
+esac
diff --git a/contrib/ntp/scripts/rc/rc.d/TIMESYNC b/contrib/ntp/scripts/rc/rc.d/TIMESYNC
new file mode 100644
index 0000000..a8c074f
--- /dev/null
+++ b/contrib/ntp/scripts/rc/rc.d/TIMESYNC
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# PROVIDE: TIMESYNC
+# REQUIRE: LOGIN ntpwait
+
+# This depedency ensures that all services which require stable system clock
+# are run after ntpd is synchronized. It's run as late as possible, if you need
+# stable clock before login use BEFORE: LOGIN
diff --git a/contrib/ntp/scripts/rc/rc.d/ntpd b/contrib/ntp/scripts/rc/rc.d/ntpd
new file mode 100644
index 0000000..ea33458
--- /dev/null
+++ b/contrib/ntp/scripts/rc/rc.d/ntpd
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+# PROVIDE: ntpd
+# REQUIRE: syslogd cleanvar devfs
+# BEFORE: SERVERS
+
+. /etc/rc.subr
+
+name="ntpd"
+rcvar="ntpd_enable"
+command="/usr/sbin/${name}"
+pidfile="/var/run/${name}.pid"
+start_precmd="ntpd_precmd"
+
+load_rc_config $name
+
+ntpd_precmd()
+{
+        rc_flags="-c ${ntpd_config} ${ntpd_flags}"
+
+        if checkyesno ntpd_sync_on_start; then
+                rc_flags="-g $rc_flags"
+        fi
+
+        if [ -z "$ntpd_chrootdir" ]; then
+                return 0;
+        fi
+
+        rc_flags="-u ntpd:ntpd -i ${ntpd_chrootdir} $rc_flags"
+}
+
+run_rc_command "$1"
diff --git a/contrib/ntp/scripts/rc/rc.d/ntpwait b/contrib/ntp/scripts/rc/rc.d/ntpwait
new file mode 100644
index 0000000..891d0db
--- /dev/null
+++ b/contrib/ntp/scripts/rc/rc.d/ntpwait
@@ -0,0 +1,21 @@
+#!/bin/sh
+# This script, when run, runs ntp-wait if ntpd is enabled.
+
+# PROVIDE: ntpwait
+
+. /etc/rc.subr
+
+name="ntpwait"
+rcvar="ntpwait_enable"
+start_cmd="ntpwait_start"
+ntp_wait="/usr/sbin/ntp-wait"
+
+load_rc_config "$name"
+
+ntpwait_start() {
+        if checkyesno ntpd_enable; then
+                $ntp_wait -v
+        fi
+}
+
+run_rc_command "$1"