From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 30 Jul 2006 03:18:50 +0000 (+0000)
Subject: only set dhcp_enable if lan proto is set to static
X-Git-Tag: reboot~30718^2~359
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f646e7cbe1ac8ab055a0e91e91a9f5fb12a6005a;p=oweals%2Fopenwrt.git

only set dhcp_enable if lan proto is set to static

SVN-Revision: 4324
---

diff --git a/openwrt/package/dnsmasq/files/dnsmasq.init b/openwrt/package/dnsmasq/files/dnsmasq.init
index 140f727f46..14fc698cff 100644
--- a/openwrt/package/dnsmasq/files/dnsmasq.init
+++ b/openwrt/package/dnsmasq/files/dnsmasq.init
@@ -13,8 +13,9 @@ scan_interfaces
 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}"
@@ -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
-		echo "@define dhcp_enable 1"
+		echo "${dhcp_enable:+@define dhcp_enable 1}"
 		echo "@define netmask $NETMASK"
 		echo "@define start $START"
 		echo "@define end $END"