[package] fix chrony init script and bump package release number (#4718)

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

diff --git a/net/chrony/Makefile b/net/chrony/Makefile
index 86a1c2e..e07c137 100644 (file)
--- a/net/chrony/Makefile
+++ b/net/chrony/Makefile
@@ -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/ \

diff --git a/net/chrony/files/ntpd.init b/net/chrony/files/ntpd.init
index dd9c9f5..db8992d 100644 (file)
--- a/net/chrony/files/ntpd.init
+++ b/net/chrony/files/ntpd.init
@@ -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