X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=package%2Fdnsmasq%2Ffiles%2Fdnsmasq.init;h=140f727f4683ff2789a23bac71ed595885e7785a;hp=17ef43c3d5f1c1884786f2c6271b5005a58fd808;hb=c4f3575368c5aeef4134d82125df2814d688cc2a;hpb=31d94a76a79ef8c973fb75ee17713593bfb7ebbd

diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index 17ef43c3d..140f727f4 100644
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -1,5 +1,7 @@
 #!/bin/sh
-. /etc/config/network
+. /etc/functions.sh
+include network
+scan_interfaces
 
 # The following is to automatically configure the DHCP settings
 # based on config settings. Feel free to replace all this crap
@@ -10,7 +12,7 @@
 
 args=""
 iface=lan
-eval "ifname=\${${iface}_ifname}"
+config_get ifname "$iface" ifname
 
 dhcp_enable="${dhcp_enable:-1}"
 dhcp_start="${dhcp_start:-100}"
@@ -26,8 +28,8 @@ dhcp_lease="${dhcp_lease:-12h}"
 		# no existing DHCP server?
 
 		# calculate settings
-		eval "ipaddr=\${${iface}_ipaddr}"
-		eval "netmask=\${${iface}_netmask}"
+		config_get ipaddr "$iface" ipaddr
+		config_get netmask "$iface" netmask
 		eval $(ipcalc $ipaddr $netmask ${dhcp_start:-100} ${dhcp_num:-150})
 		
 		# and pass the args via config parser defines
@@ -39,6 +41,8 @@ dhcp_lease="${dhcp_lease:-12h}"
 	}
 
 	# ignore requests from wan interface
+	config_get wan_proto wan proto
+	config_get wan_ifname wan ifname
 	[ -z "$wan_proto" -o "$wan_proto" = "none" ] || echo "@define wan_ifname $wan_ifname"
 
 	cat /etc/dnsmasq.conf