packages: Use OpenWrt ntp vendor pool in default configs. (Cleaned whitespace too.)
git-svn-id: svn://svn.openwrt.org/openwrt/packages@10189 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
182a270b1d
commit
83ccee9c38
@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
|
|||||||
|
|
||||||
PKG_NAME:=chrony
|
PKG_NAME:=chrony
|
||||||
PKG_VERSION:=1.21
|
PKG_VERSION:=1.21
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=2
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:= ftp://chrony.sunsite.dk/projects/chrony/ \
|
PKG_SOURCE_URL:= ftp://chrony.sunsite.dk/projects/chrony/ \
|
||||||
|
@ -2,5 +2,5 @@
|
|||||||
# Time servers and network(s) that may access the time service
|
# Time servers and network(s) that may access the time service
|
||||||
|
|
||||||
config ntpd
|
config ntpd
|
||||||
option TimeServers "0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org 3.pool.ntp.org"
|
option TimeServers "0.openwrt.pool.ntp.org 1.openwrt.pool.ntp.org 2.openwrt.pool.ntp.org 3.openwrt.pool.ntp.org"
|
||||||
option ClientAccessFrom "lan"
|
option ClientAccessFrom "lan"
|
||||||
|
@ -9,13 +9,13 @@ EOF
|
|||||||
}
|
}
|
||||||
|
|
||||||
[ "$ACTION" = "ifup" -a "$INTERFACE" = "wan" ] && {
|
[ "$ACTION" = "ifup" -a "$INTERFACE" = "wan" ] && {
|
||||||
[ -x $COMMAND ] && [ -n "$CHRONY_KEY" ] &&{
|
[ -x $COMMAND ] && [ -n "$CHRONY_KEY" ] &&{
|
||||||
chrony_control online
|
chrony_control online
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
[ "$ACTION" = "ifdown" -a "$INTERFACE" = "wan" ] && {
|
[ "$ACTION" = "ifdown" -a "$INTERFACE" = "wan" ] && {
|
||||||
[ -x $COMMAND ] && [ -n "$CHRONY_KEY" ] &&{
|
[ -x $COMMAND ] && [ -n "$CHRONY_KEY" ] &&{
|
||||||
chrony_control offline
|
chrony_control offline
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -6,7 +6,7 @@ START=60
|
|||||||
start() {
|
start() {
|
||||||
[ ! -f /var/run/chronyd.pid ] && (
|
[ ! -f /var/run/chronyd.pid ] && (
|
||||||
/usr/sbin/chronyd -f /etc/chrony/chrony.conf
|
/usr/sbin/chronyd -f /etc/chrony/chrony.conf
|
||||||
|
|
||||||
local NTP_SERVERS
|
local NTP_SERVERS
|
||||||
local NTP_SERVER
|
local NTP_SERVER
|
||||||
local CLIENT_NETWORKS
|
local CLIENT_NETWORKS
|
||||||
@ -17,49 +17,45 @@ start() {
|
|||||||
CHRONY_KEY=$(awk '/^1 / { print $2; }' /etc/chrony/chrony.keys)
|
CHRONY_KEY=$(awk '/^1 / { print $2; }' /etc/chrony/chrony.keys)
|
||||||
include /lib/network
|
include /lib/network
|
||||||
scan_interfaces
|
scan_interfaces
|
||||||
|
|
||||||
# Define servers and do a rapid series of time measurements
|
# Define servers and do a rapid series of time measurements
|
||||||
# to get up to date
|
# to get up to date
|
||||||
(
|
(
|
||||||
echo password $CHRONY_KEY
|
echo password $CHRONY_KEY
|
||||||
for NTP_SERVER in $NTP_SERVERS; do
|
for NTP_SERVER in $NTP_SERVERS; do
|
||||||
echo add server $NTP_SERVER
|
echo add server $NTP_SERVER
|
||||||
done
|
done
|
||||||
echo burst 5/5
|
echo burst 5/5
|
||||||
) | chronyc > /dev/null 2>&1
|
) | chronyc > /dev/null 2>&1
|
||||||
|
# ... wait until a reference ID is found ...
|
||||||
# ... wait until a reference ID is found ...
|
while chronyc tracking | grep 'Reference ID.*0.0.0.0' >/dev/null ; do sleep 1; done
|
||||||
while chronyc tracking | grep 'Reference ID.*0.0.0.0' >/dev/null ; do sleep 1; done
|
# ... and finally, adjust the time in a single step
|
||||||
|
# and allow clients to access the server
|
||||||
|
(
|
||||||
# ... and finally, adjust the time in a single step
|
echo password $CHRONY_KEY
|
||||||
# and allow clients to access the server
|
echo makestep
|
||||||
(
|
for NETNAME in $CLIENT_NETWORKS; do
|
||||||
echo password $CHRONY_KEY
|
local INTERFACE
|
||||||
echo makestep
|
local IP
|
||||||
for NETNAME in $CLIENT_NETWORKS; do
|
local NETMASK
|
||||||
local INTERFACE
|
local BROADCAST
|
||||||
local IP
|
local NETWORK
|
||||||
local NETMASK
|
local PREFIX
|
||||||
local BROADCAST
|
|
||||||
local NETWORK
|
config_get INTERFACE "$NETNAME" ifname
|
||||||
local PREFIX
|
if [ -n "$INTERFACE" ] ; then
|
||||||
|
eval $(ifconfig $INTERFACE | grep inet | sed -e 's/.*addr:/IP=/' -e 's/ .*Mask:/; NETMASK=/')
|
||||||
config_get INTERFACE "$NETNAME" ifname
|
eval $(ipcalc $IP $NETMASK)
|
||||||
if [ -n "$INTERFACE" ] ; then
|
echo allow $NETWORK/$PREFIX
|
||||||
eval $(ifconfig $INTERFACE | grep inet | sed -e 's/.*addr:/IP=/' -e 's/ .*Mask:/; NETMASK=/')
|
fi
|
||||||
eval $(ipcalc $IP $NETMASK)
|
done
|
||||||
echo allow $NETWORK/$PREFIX
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
) | chronyc > /dev/null 2>&1
|
) | chronyc > /dev/null 2>&1
|
||||||
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
stop() {
|
stop() {
|
||||||
[ -r /var/run/chronyd.pid ] && PID=$(cat /var/run/chronyd.pid)
|
[ -r /var/run/chronyd.pid ] && PID=$(cat /var/run/chronyd.pid)
|
||||||
[ -n "$PID" ] && kill $PID
|
[ -n "$PID" ] && kill $PID
|
||||||
}
|
}
|
||||||
|
|
||||||
restart() {
|
restart() {
|
||||||
|
@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
|
|||||||
|
|
||||||
PKG_NAME:=ntpclient
|
PKG_NAME:=ntpclient
|
||||||
PKG_VERSION:=2003_194
|
PKG_VERSION:=2003_194
|
||||||
PKG_RELEASE:=5
|
PKG_RELEASE:=6
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=http://doolittle.icarus.com/ntpclient/
|
PKG_SOURCE_URL:=http://doolittle.icarus.com/ntpclient/
|
||||||
@ -35,7 +35,7 @@ endef
|
|||||||
MAKE_FLAGS += \
|
MAKE_FLAGS += \
|
||||||
all adjtimex
|
all adjtimex
|
||||||
|
|
||||||
define Package/ntpclient/install
|
define Package/ntpclient/install
|
||||||
$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
|
$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
|
||||||
$(INSTALL_DATA) ./files/ntpclient.hotplug $(1)/etc/hotplug.d/iface/20-ntpclient
|
$(INSTALL_DATA) ./files/ntpclient.hotplug $(1)/etc/hotplug.d/iface/20-ntpclient
|
||||||
$(INSTALL_DIR) $(1)/etc/config
|
$(INSTALL_DIR) $(1)/etc/config
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
config ntpclient
|
config ntpclient
|
||||||
option hostname 'pool.ntp.org'
|
option hostname '0.openwrt.pool.ntp.org'
|
||||||
option port '123'
|
option port '123'
|
||||||
option count '1'
|
option count '1'
|
||||||
|
|
||||||
config ntpclient
|
config ntpclient
|
||||||
option hostname 'ntp.ubuntu.com'
|
option hostname '1.openwrt.pool.ntp.org'
|
||||||
option port '123'
|
option port '123'
|
||||||
option count '1'
|
option count '1'
|
||||||
|
@ -13,7 +13,7 @@ config_cb() {
|
|||||||
ntpclient)
|
ntpclient)
|
||||||
config_get hostname $cfg hostname
|
config_get hostname $cfg hostname
|
||||||
config_get port $cfg port
|
config_get port $cfg port
|
||||||
config_get count $cfg count
|
config_get count $cfg count
|
||||||
|
|
||||||
[ "$DONE" = "1" ] && exit 0
|
[ "$DONE" = "1" ] && exit 0
|
||||||
ps | grep 'bin/[n]tpclient' >&- || {
|
ps | grep 'bin/[n]tpclient' >&- || {
|
||||||
|
@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
|
|||||||
|
|
||||||
PKG_NAME:=ntp
|
PKG_NAME:=ntp
|
||||||
PKG_VERSION:=4.2.4p4
|
PKG_VERSION:=4.2.4p4
|
||||||
PKG_RELEASE:=2
|
PKG_RELEASE:=3
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/
|
PKG_SOURCE_URL:=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/
|
||||||
|
@ -9,10 +9,10 @@ restrict 127.0.0.1
|
|||||||
|
|
||||||
driftfile /tmp/ntp.drift
|
driftfile /tmp/ntp.drift
|
||||||
|
|
||||||
server 0.pool.ntp.org iburst
|
server 0.openwrt.pool.ntp.org iburst
|
||||||
server 1.pool.ntp.org iburst
|
server 1.openwrt.pool.ntp.org iburst
|
||||||
server 2.pool.ntp.org iburst
|
server 2.openwrt.pool.ntp.org iburst
|
||||||
server 3.pool.ntp.org iburst
|
server 3.openwrt.pool.ntp.org iburst
|
||||||
|
|
||||||
|
|
||||||
# GPS(NMEA)+PPS
|
# GPS(NMEA)+PPS
|
||||||
|
@ -3,17 +3,17 @@
|
|||||||
|
|
||||||
START=60
|
START=60
|
||||||
|
|
||||||
STEP_SERVERS="pool.ntp.org pool.ntp.org pool.ntp.org"
|
STEP_SERVERS="0.openwrt.pool.ntp.org 1.openwrt.pool.ntp.org 2.openwrt.pool.ntp.org"
|
||||||
PIDFILE="/var/run/ntpd.pid"
|
PIDFILE="/var/run/ntpd.pid"
|
||||||
TIMEOUT="2" # in seconds
|
TIMEOUT="2" # in seconds
|
||||||
|
|
||||||
start() {
|
start() {
|
||||||
# ln -sf /dev/ttyS0 /dev/gps0
|
# ln -sf /dev/ttyS0 /dev/gps0
|
||||||
# /usr/sbin/setgarmin -d /dev/gps -c /etc/setgarmin.conf
|
# /usr/sbin/setgarmin -d /dev/gps -c /etc/setgarmin.conf
|
||||||
stop
|
stop
|
||||||
for s in $STEP_SERVERS ; do
|
for s in $STEP_SERVERS ; do
|
||||||
/usr/sbin/ntpdate -s -b -u -t "$TIMEOUT" "$s" && break
|
/usr/sbin/ntpdate -s -b -u -t "$TIMEOUT" "$s" && break
|
||||||
done
|
done
|
||||||
/usr/sbin/ntpd -g -p $PIDFILE
|
/usr/sbin/ntpd -g -p $PIDFILE
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
|
|||||||
|
|
||||||
PKG_NAME:=openntpd
|
PKG_NAME:=openntpd
|
||||||
PKG_VERSION:=3.9p1
|
PKG_VERSION:=3.9p1
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=2
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/ \
|
PKG_SOURCE_URL:=ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/ \
|
||||||
|
@ -1,3 +1,6 @@
|
|||||||
# use a random selection of 8 public stratum 2 servers
|
# use a random selection of 8 public stratum 2 servers
|
||||||
# see http://twiki.ntp.org/bin/view/Servers/NTPPoolServers
|
# see http://twiki.ntp.org/bin/view/Servers/NTPPoolServers
|
||||||
servers pool.ntp.org
|
servers 0.openwrt.pool.ntp.org
|
||||||
|
servers 1.openwrt.pool.ntp.org
|
||||||
|
servers 2.openwrt.pool.ntp.org
|
||||||
|
servers 3.openwrt.pool.ntp.org
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
# use a random selection of 8 public stratum 2 servers
|
# use a random selection of 8 public stratum 2 servers
|
||||||
# see http://twiki.ntp.org/bin/view/Servers/NTPPoolServers
|
# see http://twiki.ntp.org/bin/view/Servers/NTPPoolServers
|
||||||
servers pool.ntp.org
|
servers 0.openwrt.pool.ntp.org
|
||||||
|
Loading…
x
Reference in New Issue
Block a user