Merge pull request #396 from fanthos/master

[project/luci.git] / contrib / package / meshwizard / files / usr / bin / meshwizard / helpers / setup_dhcp.sh

diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_dhcp.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_dhcp.sh
index a6f16b3..8cce831 100755 (executable)
--- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_dhcp.sh
+++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_dhcp.sh
@@ -20,19 +20,25 @@ config_foreach handle_dnsmasq dhcp
 
 [ "$net" == "lan" ] && uci -q delete dhcp.lan
 
-if [ "$vap" == 1 ]; then
+if [ "$supports_vap" = 1 -a "$vap" = 1 ]; then
        uci batch <<- EOF
                set dhcp.${netrenamed}dhcp="dhcp"
+               set dhcp.${netrenamed}dhcp.ignore="0"
                set dhcp.${netrenamed}dhcp.interface="${netrenamed}dhcp"
        EOF
        set_defaults "dhcp_" dhcp.${netrenamed}dhcp
 fi
 
-uci batch << EOF
-       set dhcp.${netrenamed}ahdhcp="dhcp"
-       set dhcp.${netrenamed}ahdhcp.interface="${netrenamed}ahdhcp"
-EOF
-
+ahdhcp_when_vap="$(uci get profile_$community.profile.adhoc_dhcp_when_vap)"
+if [ "$supports_vap" = 0 ] || \
+       [ "$supports_vap" = 1 -a "$vap" = 1 -a "$ahdhcp_when_vap" = 1 ] || \
+       [ "$lan_is_olsr" = "1" -a "$lan_dhcp" = 1 ]; then
+       uci batch <<- EOF
+               set dhcp.${netrenamed}ahdhcp="dhcp"
+               set dhcp.${netrenamed}ahdhcp.ignore="0"
+               set dhcp.${netrenamed}ahdhcp.interface="${netrenamed}ahdhcp"
+       EOF
+fi
 set_defaults "dhcp_" dhcp.${netrenamed}ahdhcp
 
 uci_commitverbose "Setup DHCP for $netrenamed" dhcp