contrib/meshwizard: Better formatting

[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 4c7ea5a..0a5c96b 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
@@ -9,25 +9,20 @@ net="$1"
 handle_dnsmasq() {
        config_get interface "$1" interface
        if [ "$interface" == "${netrenamed}dhcp" ]; then
-               if [ "$cleanup" == 1 ]; then
-                       section_cleanup dhcp.$1
-               else
-                       if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then
-                               section_rename dhcp $1 ${netrenamed}dhcp
-                        fi
-                fi
-        fi
+               if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then
+                       section_rename dhcp $1 ${netrenamed}dhcp
+               fi
+       fi
 }
 config_load dhcp
 config_foreach handle_dnsmasq dhcp
 
 uci batch << EOF
-set dhcp.${netrenamed}dhcp="dhcp"
-set dhcp.${netrenamed}dhcp.leasetime="${dhcp_leasetime}"
-set dhcp.${netrenamed}dhcp.force="1"
-set dhcp.${netrenamed}dhcp.interface="${netrenamed}dhcp"
+       set dhcp.${netrenamed}dhcp="dhcp"
+       set dhcp.${netrenamed}dhcp.interface="${netrenamed}dhcp"
 EOF
 
-echo "    leasetime: ${dhcp_leasetime}
-    interface: ${netrenamed}dhcp"
+set_defaults "dhcp_" dhcp.${netrenamed}dhcp
+
+uci_commitverbose "Setup DHCP for $netrenamed" dhcp