Merge remote-tracking branch 'Jason/main' into main

root/easymesh/easymesh.sh

@@ -272,9 +272,6 @@ set_easymesh() {
             add_dawn
         fi
 
-        add_kvr
-        add_dawn
-
         if [ "$ap_mode" = 1 ]; then
             # Backup Configurations if your scared
             cp /etc/config/wireless /etc/config/wireless.backup
@@ -309,11 +306,13 @@ set_easymesh() {
             uci set network.lan.gateway=$dns
             uci set system.@system[0].hostname=$gateway
 
-            # First, delete the existing interface list from br-lan
-            uci -q delete network.lan.ifname
-
             # Configure LAN bridge and add ethernet interfaces to the bridge
-            uci set network.lan.ifname='eth0 eth1 wan lan1 lan2' # Add ethernet and wan
+            uci del network.@device[0].ports
+            uci add_list network.@device[0].ports='bat0'
+            uci add_list network.@device[0].ports='eth0'
+            uci add_list network.@device[0].ports='lan1'
+            uci add_list network.@device[0].ports='lan2'
+            uci add_list network.@device[0].ports='wan'
             uci set network.lan.type='bridge'
 
             # If you also need to configure the wireless network to be part of the bridge: