diff -Naru old/ntpd up/ntpd
--- old/ntpd	2017-05-30 11:08:30.368920821 -0500
+++ up/ntpd	2017-05-30 11:52:42.965527343 -0500
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
 
 ### BEGIN INIT INFO
 # Provides:        ntp
@@ -9,7 +9,9 @@
 # Short-Description: Start NTP daemon
 ### END INIT INFO
 
+. /etc/default/ntpd
 PATH=/sbin:/bin:/usr/bin:/usr/sbin
+GNSSRST=/sys/devices/platform/mts-io/gnss-reset
 
 DAEMON=/usr/sbin/ntpd
 PIDFILE=/var/run/ntpd.pid
@@ -34,13 +36,35 @@
 	}
 }
 startdaemon(){
-	# The -g option allows ntpd to step the time to correct it just
-	# once.  The daemon will exit if the clock drifts too much after
-	# this.  If ntpd seems to disappear after a while assume TICKADJ
-	# above is set to a totally incorrect value.
-	echo -n "Starting ntpd: "
-	start-stop-daemon --start --quiet --oknodo --pidfile $PIDFILE --startas $DAEMON -- -u ntp:ntp -p $PIDFILE "$@"
-	echo "done"
+	/usr/sbin/start-stop-daemon -N -20 --start -x /usr/sbin/ntpd --test -- -u ntp:ntp -p /var/run/ntp.pid "$@" \
+	  || return 1
+	if [[ -x /usr/sbin/gpsd_ubx_settime ]] && ((GPSD_REQUIRED == 1)) && [[ -L /dev/gps0 ]] && [[ -f "${GNSSRST}" ]]; then
+		. /etc/default/gpsd
+		if ((SET_SYSTEM_CLOCK == 1)) && /usr/sbin/gpsd_ubx_settime ; then
+		   # We just set the system time by the GPS.  Should be within 2 seconds.
+		   # Now that we are close to the correct system time, we
+		   # use the ntpd one shot option to get to less than
+		   # 250mS error so that we don't waste time adjusting the clock.
+		   /usr/sbin/ntpd -gq
+		   start-stop-daemon -N -20 --start --quiet --oknodo --pidfile $PIDFILE --startas $DAEMON -- -u ntp:ntp -p $PIDFILE "$@"
+		else
+		  # Need a GPS fix before startint ntp.  Try again later.
+		  /usr/sbin/start-stop-daemon -b -n z1e9d3qb -N -20 --start -x /bin/bash -- -c "sleep $GPSD_WAIT_TIME;/etc/init.d/ntpd start"
+		fi
+	else
+	  if ((SET_SYSTEM_CLOCK == 1)) ; then
+	    # Sets the clock and exits.
+	    ntpd -gq
+	    shift
+	  fi
+	  # The -g option allows ntpd to step the time to correct it just
+	  # once.  The daemon will exit if the clock drifts too much after
+	  # this.  If ntpd seems to disappear after a while assume TICKADJ
+	  # above is set to a totally incorrect value.
+	  echo -n "Starting ntpd: "
+	  start-stop-daemon -N -20 --start --quiet --oknodo --pidfile $PIDFILE --startas $DAEMON -- -u ntp:ntp -p $PIDFILE "$@"
+	  echo "done"
+	fi
 }
 stopdaemon(){
 	echo -n "Stopping ntpd: "
@@ -50,6 +74,20 @@
 
 case "$1" in
   start)
+	if ! [[ $ENABLED =~ ^[yY][eE][sS]$ ]] ; then
+		exit 0
+	fi
+	if [[ -n "$CONFIGFILE" ]] ; then
+		CONFIGOPT="-c ${CONFIGFILE}"
+		STATSDIR=$(grep "^statsdir" ${CONFIGFILE} | sed -r 's/[^[:space:]]+[[:space:]]//')
+		if ((${#STATSDIR} > 0)) && ! [[ -d ${STATSDIR} ]] ; then
+			echo Make ${STATSDIR}	
+			mkdir -m 0755 -p ${STATSDIR}
+		fi
+		if [[ -d ${STATSDIR} ]] ; then
+			chown ntp:ntp ${STATSDIR} >/dev/null 2>&1
+		fi
+	fi
   	settick
 	startdaemon -g
 	;;