From 18057c7b1c04b15961ba9001625ef9ff4420335d Mon Sep 17 00:00:00 2001
From: ben <ben@privatemail.com>
Date: Sun, 1 Oct 2023 04:55:29 +0000
Subject: [PATCH] Update 'root/etc/init.d/easymesh'

---
 root/etc/init.d/easymesh | 73 ++++++++++++++++++++--------------------
 1 file changed, 37 insertions(+), 36 deletions(-)

diff --git a/root/etc/init.d/easymesh b/root/etc/init.d/easymesh
index 9ef00ea..ac85f9b 100755
--- a/root/etc/init.d/easymesh
+++ b/root/etc/init.d/easymesh
@@ -259,42 +259,43 @@ set_easymesh() {
 		add_dawn
 
 		if [ "$ap_mode" = 1 ]; then
-            cp /etc/config/wireless /etc/config/wireless.backup
-            cp /etc/config/network /etc/config/network.backup
-			uci set network.lan.type='bridge'
-            # assign WAN physical interface to LAN (will be available as an additional LAN port now)
-            uci set network.lan.ifname="$(uci get network.lan.ifname) $(uci get network.wan.ifname)"
-            uci del network.wan.ifname
-            # Remove wan logical interface, since we will not need it.
-            # uci del network.wan
-            uci set wireless.mesh_$apall.mesh_fwding='1'
-            uci commit dhcp; echo '' > /etc/config/dhcp
-            /etc/init.d/dnsmasq disable
-            /etc/init.d/dnsmasq stop
-
-            echo switching the lan interface to DHCP client
-            uci del network.lan.broadcast
-            uci del network.lan.dns
-            uci del network.lan.gateway
-            uci del network.lan.ipaddr
-            uci del network.lan.netmask
-            uci set network.lan.proto='dhcp'
-			#uci set dhcp.lan.dynamicdhcp='0'
-			#uci set dhcp.lan.ignore='1'
-            uci set system.@system[0].hostname=$gateway
-            uci set network.lan.hostname="`uci get system.@system[0].hostname`"
-
-            uci commit
-            sync
-            /etc/init.d/network restart
-
-            #echo removing firewall config
-            #mv /etc/config/firewall /etc/config/firewall.restore
-
-            # reboot the device
-
-            reboot
-       fi
+    # Backup Configurations
+    cp /etc/config/wireless /etc/config/wireless.backup
+    cp /etc/config/network /etc/config/network.backup
+    cp /etc/config/dhcp /etc/config/dhcp.backup
+
+    # Configure Bridge and Interfaces
+    uci set network.lan.type='bridge'
+    uci set network.lan.ifname="$(uci get network.lan.ifname) $(uci get network.wan.ifname)"
+    uci del network.wan.ifname
+    uci set wireless.mesh_$apall.mesh_fwding='1'
+
+    # Disable dnsmasq
+    uci commit dhcp; echo '' > /etc/config/dhcp
+    /etc/init.d/dnsmasq disable
+    /etc/init.d/dnsmasq stop
+    
+    # Switch LAN to DHCP Client
+    echo "Switching the LAN interface to DHCP client"
+    uci del network.lan.broadcast
+    uci del network.lan.dns
+    uci del network.lan.gateway
+    uci del network.lan.ipaddr
+    uci del network.lan.netmask
+    uci set network.lan.proto='dhcp'
+    uci set system.@system[0].hostname=$gateway
+    uci set network.lan.hostname="`uci get system.@system[0].hostname`"
+    
+    # Commit Changes and Restart Network
+    uci commit
+    sync
+    /etc/init.d/network restart
+    
+    # Reboot the device
+    echo "Rebooting the device..."
+    reboot
+fi
+
 
 		else
 			ap_mode_stop