[Astlinux-commits] SF.net SVN: astlinux:[5266] branches/1.0

[<abe...@us...>]

Revision: 5266
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5266&view=rev
Author:   abelbeck
Date:     2011-11-22 12:45:35 +0000 (Tue, 22 Nov 2011)
Log Message:
-----------
ntpd, version bump to 4.2.6p4, change setting initial clock from 'ntpd -gq' to 'sntp -s' to fix an issue where 'ntpd -gq' could hang for up to three minutes in some cases
Note: BR2_PACKAGE_NTP_SNTP=y is now required, devs make that change in your custom .configs

Modified Paths:
--------------
    branches/1.0/astlinux.config
    branches/1.0/astlinux18.config
    branches/1.0/package/ntp/ntp.mk
    branches/1.0/package/ntp/ntpd.init

Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config	2011-11-21 20:02:58 UTC (rev 5265)
+++ branches/1.0/astlinux.config	2011-11-22 12:45:35 UTC (rev 5266)
@@ -686,7 +686,7 @@
 BR2_PACKAGE_NGREP=y
 # BR2_PACKAGE_NMAP is not set
 BR2_PACKAGE_NTP=y
-# BR2_PACKAGE_NTP_SNTP is not set
+BR2_PACKAGE_NTP_SNTP=y
 # BR2_PACKAGE_NTP_NTP_KEYGEN is not set
 # BR2_PACKAGE_NTP_NTP_WAIT is not set
 BR2_PACKAGE_NTP_NTPD=y

Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config	2011-11-21 20:02:58 UTC (rev 5265)
+++ branches/1.0/astlinux18.config	2011-11-22 12:45:35 UTC (rev 5266)
@@ -681,7 +681,7 @@
 BR2_PACKAGE_NGREP=y
 # BR2_PACKAGE_NMAP is not set
 BR2_PACKAGE_NTP=y
-# BR2_PACKAGE_NTP_SNTP is not set
+BR2_PACKAGE_NTP_SNTP=y
 # BR2_PACKAGE_NTP_NTP_KEYGEN is not set
 # BR2_PACKAGE_NTP_NTP_WAIT is not set
 BR2_PACKAGE_NTP_NTPD=y

Modified: branches/1.0/package/ntp/ntp.mk
===================================================================
--- branches/1.0/package/ntp/ntp.mk	2011-11-21 20:02:58 UTC (rev 5265)
+++ branches/1.0/package/ntp/ntp.mk	2011-11-22 12:45:35 UTC (rev 5266)
@@ -3,7 +3,7 @@
 # ntp
 #
 #############################################################
-NTP_VERSION = 4.2.4p8
+NTP_VERSION = 4.2.6p4
 NTP_SOURCE = ntp-$(NTP_VERSION).tar.gz
 NTP_SITE = http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2
 

Modified: branches/1.0/package/ntp/ntpd.init
===================================================================
--- branches/1.0/package/ntp/ntpd.init	2011-11-21 20:02:58 UTC (rev 5265)
+++ branches/1.0/package/ntp/ntpd.init	2011-11-22 12:45:35 UTC (rev 5266)
@@ -3,6 +3,10 @@
 . /etc/rc.conf
 
 init () {
+
+  # So sntp doesn't complain
+  touch /var/db/ntp-kod
+
   if [ -f /mnt/kd/ntpd.conf ]; then
     ln -sf /mnt/kd/ntpd.conf /tmp/etc/ntpd.conf
   else
@@ -59,10 +63,13 @@
 
       if nslookup $first >/dev/null; then
         # Set the clock (large change) and exit
-        ntpd $NTPAF -g -q -c /etc/ntpd.conf
+        sntp $NTPAF -s -t4 $first
+        if [ $? -eq 0 -a -r /dev/rtc ]; then
+          hwclock -wu --noadjfile 2>/dev/null
+        fi
         sleep 1
         # Maintain the clock (small changes)
-        ntpd $NTPAF -c /etc/ntpd.conf
+        ntpd $NTPAF -g -c /etc/ntpd.conf
       fi
     fi
   fi

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.