merge r15139 to 8.09 (closes: #4718), bump release number
authorNicolas Thill <nico@openwrt.org>
Fri, 10 Apr 2009 13:59:00 +0000 (13:59 +0000)
committerNicolas Thill <nico@openwrt.org>
Fri, 10 Apr 2009 13:59:00 +0000 (13:59 +0000)
SVN-Revision: 15203

net/chrony/Makefile
net/chrony/files/ntpd.init

index 86a1c2e..e07c137 100644 (file)
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=chrony
 PKG_VERSION:=1.23
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:= ftp://chrony.sunsite.dk/projects/chrony/ \
index dd9c9f5..db8992d 100644 (file)
@@ -12,8 +12,8 @@ start() {
                local CLIENT_NETWORKS
                local NETNAME
                config_load ntpd
-               config_get NTP_SERVERS cfg1 TimeServers
-               config_get CLIENT_NETWORKS cfg1 ClientAccessFrom
+               config_get NTP_SERVERS $cfg1 TimeServers
+               config_get CLIENT_NETWORKS $cfg1 ClientAccessFrom
                CHRONY_KEY=$(awk '/^1 / { print $2; }' /etc/chrony/chrony.keys)
                include /lib/network
                scan_interfaces
@@ -45,7 +45,7 @@ start() {
                                config_get INTERFACE "$NETNAME" ifname
                                if [ -n "$INTERFACE" ] ; then
                                        eval $(ifconfig $INTERFACE | grep inet | sed -e 's/.*addr:/IP=/' -e 's/ .*Mask:/; NETMASK=/')
-                                       eval $(ipcalc $IP $NETMASK)
+                                       eval $(ipcalc.sh $IP $NETMASK)
                                        echo allow $NETWORK/$PREFIX
                                fi
                        done