diff options
| author | John Klug <john.klug@multitech.com> | 2017-02-03 13:21:46 -0600 |
|---|---|---|
| committer | John Klug <john.klug@multitech.com> | 2017-02-03 13:21:46 -0600 |
| commit | 5a7f59302b63aad3b09772bf5bf9b55d78f10399 (patch) | |
| tree | 90e73a20913e6a40ecd9464ef3f5a54704c25cdd | |
| parent | efbee987abfb77ac30d7e482736c53146e685bc5 (diff) | |
| download | meta-mlinux-5a7f59302b63aad3b09772bf5bf9b55d78f10399.tar.gz meta-mlinux-5a7f59302b63aad3b09772bf5bf9b55d78f10399.tar.bz2 meta-mlinux-5a7f59302b63aad3b09772bf5bf9b55d78f10399.zip | |
Remove redundant ntpd -gq
| -rw-r--r-- | recipes-support/ntp/files/ntpd-init.patch | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/recipes-support/ntp/files/ntpd-init.patch b/recipes-support/ntp/files/ntpd-init.patch index 3ff2823..d1c3a84 100644 --- a/recipes-support/ntp/files/ntpd-init.patch +++ b/recipes-support/ntp/files/ntpd-init.patch @@ -1,6 +1,6 @@ diff -Naur old/ntpd new/ntpd --- old/ntpd 2017-02-03 10:11:28.136849640 -0600 -+++ new/ntpd 2017-02-03 10:33:58.537991855 -0600 ++++ new/ntpd 2017-02-03 13:19:42.629257684 -0600 @@ -1,6 +1,8 @@ -#! /bin/sh +#! /bin/bash @@ -11,7 +11,7 @@ diff -Naur old/ntpd new/ntpd # ntpd init.d script for ntpdc from ntp.isc.org test -x /usr/sbin/ntpd -a -r /etc/ntp.conf || exit 0 -@@ -18,13 +20,29 @@ +@@ -18,13 +20,25 @@ } } startdaemon(){ @@ -27,11 +27,7 @@ diff -Naur old/ntpd new/ntpd + if ((GPSD_REQUIRED == 1)) && [[ -L /dev/gps0 ]] && [[ -f "${GNSSRST}" ]]; then + . /etc/default/gpsd + if ((SET_SYSTEM_CLOCK == 1)) && /usr/sbin/gpsd_ubx_settime ; then -+ # System time set by the GPS. Should be within 2 seconds. -+ # -x option below allows 600 seconds of error. Without -x -+ # we need 128mS accurace, which is not provided by -+ # gpsd_ubx_settime. -+ ntpd -gq ++ # System time was just set by the GPS. + /usr/sbin/start-stop-daemon -N -20 --start -x /usr/sbin/ntpd -- -u ntp:ntp -p /var/run/ntp.pid "$@" + else + # Need a GPS fix before startint ntp. Try again later. @@ -48,7 +44,7 @@ diff -Naur old/ntpd new/ntpd } stopdaemon(){ echo -n "Stopping ntpd: " -@@ -34,24 +52,38 @@ +@@ -34,24 +48,38 @@ case "$1" in start) |