Add fixes from #1329

git-svn-id: svn://svn.openwrt.org/openwrt/packages@6552 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/net/ntpd/Makefile b/net/ntpd/Makefile
index 181ad0e..4607546 100644 (file)
--- a/net/ntpd/Makefile
+++ b/net/ntpd/Makefile
@@ -60,9 +60,9 @@ define Package/ntpd/install
        $(INSTALL_DIR) $(1)/etc
        $(INSTALL_DATA) ./files/ntp.conf $(1)/etc/
        $(INSTALL_DIR) $(1)/etc/init.d
-       $(INSTALL_DATA) ./files/ntpd.init $(1)/etc/init.d/ntpd
+       $(INSTALL_BIN) ./files/ntpd.init $(1)/etc/init.d/ntpd
        $(INSTALL_DIR) $(1)/etc/hotplug.d/iface
-       $(INSTALL_DATA) ./files/ntpd.hotplug $(1)/etc/hotplug.d/iface/20-ntpd
+       $(INSTALL_BIN) ./files/ntpd.hotplug $(1)/etc/hotplug.d/iface/20-ntpd
 endef
 
 $(eval $(call BuildPackage,ntpd))

diff --git a/net/ntpd/files/ntp.conf b/net/ntpd/files/ntp.conf
index 9b42112..4d502b2 100644 (file)
--- a/net/ntpd/files/ntp.conf
+++ b/net/ntpd/files/ntp.conf
@@ -1,15 +1,19 @@
 # use a random selection of 8 public stratum 2 servers
 # see http://twiki.ntp.org/bin/view/Servers/NTPPoolServers
 
-restrict default nomodify notrap noquery
+#restrict default nomodify notrap noquery
+#restrict default noquery
+
 
 restrict 127.0.0.1
-restrict 192.168.1.253
 
 driftfile  /etc/ntp.drift
 
-server 127.127.1.0
-fudge   127.127.1.0 stratum 10
+server 0.pool.ntp.org iburst
+server 1.pool.ntp.org iburst
+server 2.pool.ntp.org iburst
+server 3.pool.ntp.org iburst
+
 
 # GPS(NMEA)+PPS
 #server 127.127.20.0 minpoll 4 prefer