only set dhcp_enable if lan proto is set to static

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4324 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index 140f727..14fc698 100644 (file)
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -13,8 +13,9 @@ scan_interfaces
 args=""
 iface=lan
 config_get ifname "$iface" ifname
 args=""
 iface=lan
 config_get ifname "$iface" ifname

+config_get proto "$iface" proto

 
 

-dhcp_enable="${dhcp_enable:-1}"
+[ "$proto" = static ] && dhcp_enable="${dhcp_enable:-1}"

 dhcp_start="${dhcp_start:-100}"
 dhcp_num="${dhcp_num:-50}"
 dhcp_lease="${dhcp_lease:-12h}"
 dhcp_start="${dhcp_start:-100}"
 dhcp_num="${dhcp_num:-50}"
 dhcp_lease="${dhcp_lease:-12h}"


@@ -33,7 +34,7 @@ dhcp_lease="${dhcp_lease:-12h}"
                eval $(ipcalc $ipaddr $netmask ${dhcp_start:-100} ${dhcp_num:-150})
                
                # and pass the args via config parser defines
                eval $(ipcalc $ipaddr $netmask ${dhcp_start:-100} ${dhcp_num:-150})
                
                # and pass the args via config parser defines

-               echo "@define dhcp_enable 1"
+               echo "${dhcp_enable:+@define dhcp_enable 1}"

                echo "@define netmask $NETMASK"
                echo "@define start $START"
                echo "@define end $END"
                echo "@define netmask $NETMASK"
                echo "@define start $START"
                echo "@define end $END"