luci-0.10: Merge r7846

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 0a5c96b860c6e00ddebf2226c7766ea19b405171..d89da3a5d5693c9c5144b9b4868c9fedf07b6a42 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
@@ -17,6 +17,8 @@ handle_dnsmasq() {
 config_load dhcp
 config_foreach handle_dnsmasq dhcp
 
+[ "$net" == "lan" ] && uci -q delete dhcp.lan
+
 uci batch << EOF
        set dhcp.${netrenamed}dhcp="dhcp"
        set dhcp.${netrenamed}dhcp.interface="${netrenamed}dhcp"

diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd_interface.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd_interface.sh
index 7472b625d9d7894c9a9bb9e5e6021637464981b0..f9f07aaa6f21d7a8eb217b46ab9585343a044b74 100755 (executable)
--- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd_interface.sh
+++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd_interface.sh
@@ -28,18 +28,15 @@ uci set olsrd.$netrenamed.interface="$netrenamed"
 uci_commitverbose "Setup olsr interface for $netrenamed." olsrd
 
 # If dhcp-network is inside the mesh_network then add HNA for it
-dhcprange=$(uci -q get meshwizard.netconfig.$net\_dhcprange)
 
+dhcprange=$(uci -q get meshwizard.netconfig.$net\_dhcprange)
 uci -q delete olsrd.${netrenamed}clients
 
-# check if the dhcprange is inside meshnet
-
-if [ "$dhcp_range" == 1 ]; then
-       dhcpinmesh="$($dir/helpers/check-range-in-range.sh $dhcprange $meshnet)"
+if [ -n "$dhcprange" ]; then
        meshnet="$(uci get profile_$community.profile.mesh_network)"
+       dhcpinmesh="$($dir/helpers/check-range-in-range.sh $dhcprange $meshnet)"
 
-       # If it is setup hna for it
-       if [ "$dhcpinmesh" == 1 ]; then
+       if [ "$dhcpinmesh" == 1 ] && [ -n "$meshnet" ]; then
                uci set olsrd.${netrenamed}clients="Hna4"
                eval $(sh $dir/helpers/ipcalc-cidr.sh $dhcprange)
                uci set olsrd.${netrenamed}clients.netaddr="$NETWORK"
@@ -47,4 +44,3 @@ if [ "$dhcp_range" == 1 ]; then
                uci_commitverbose "Setup HNA for network $dhcprange" olsrd
        fi
 fi
-