From 91a484709e3e0cb7f48ac19813a969c79ede4d2a Mon Sep 17 00:00:00 2001 From: Tim Yardley Date: Tue, 21 Nov 2006 17:05:26 +0000 Subject: [PATCH] rename ipcalc to ipcalc.sh and change known calls to it. this prevents the confusion with the busybox builtin of ipcalc if enabled SVN-Revision: 5607 --- openwrt/package/base-files/default/bin/{ipcalc => ipcalc.sh} | 0 openwrt/package/base-files/default/etc/init.d/rcS | 2 +- openwrt/package/dnsmasq/files/S60dnsmasq | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename openwrt/package/base-files/default/bin/{ipcalc => ipcalc.sh} (100%) diff --git a/openwrt/package/base-files/default/bin/ipcalc b/openwrt/package/base-files/default/bin/ipcalc.sh similarity index 100% rename from openwrt/package/base-files/default/bin/ipcalc rename to openwrt/package/base-files/default/bin/ipcalc.sh diff --git a/openwrt/package/base-files/default/etc/init.d/rcS b/openwrt/package/base-files/default/etc/init.d/rcS index d93c81224c..02f665877b 100755 --- a/openwrt/package/base-files/default/etc/init.d/rcS +++ b/openwrt/package/base-files/default/etc/init.d/rcS @@ -1,6 +1,6 @@ #!/bin/sh syslog_ip=$(nvram get log_ipaddr) -eval $(ipcalc "$syslog_ip") +eval $(ipcalc.sh "$syslog_ip") [ "$syslog_ip" = "$IP" ] || syslog_ip="" syslogd -C 16 ${syslog_ip:+-L -R $syslog_ip} klogd diff --git a/openwrt/package/dnsmasq/files/S60dnsmasq b/openwrt/package/dnsmasq/files/S60dnsmasq index 1699659ea6..2556a9c87e 100755 --- a/openwrt/package/dnsmasq/files/S60dnsmasq +++ b/openwrt/package/dnsmasq/files/S60dnsmasq @@ -18,7 +18,7 @@ udhcpc -n -q -R -s /bin/true -i $ifname >&- || { start=$(nvram get dhcp_start) num=$(nvram get dhcp_num) - eval $(ipcalc $ipaddr $netmask ${start:-100} ${num:-150}) + eval $(ipcalc.sh $ipaddr $netmask ${start:-100} ${num:-150}) lease=$(nvram get dhcp_lease) # and pass the args via the commandline -- 2.30.2