Update 'root/etc/init.d/easymesh'

root/etc/init.d/easymesh

@@ -1,6 +1,4 @@
-#!/bin/bash
-
-. /etc/rc.common
+#!/bin/bash /etc/rc.common
 
 START=99
 STOP=70
@@ -97,24 +95,25 @@ if [ "$encryption" != 1 ]; then
     apnum=$((apnum + 1))
     found=0
 
-    # Check all existing wifinetX and remove if SSID matches with $mesh_id and mode is 'ap'
-    while uci get wireless.wifinet$apnum > /dev/null 2>&1; do
-        existing_ssid=$(uci get wireless.wifinet$apnum.ssid 2> /dev/null)
-        existing_mode=$(uci get wireless.wifinet$apnum.mode 2> /dev/null)
-        if [ "$existing_ssid" = "$mesh_id" ] && [ "$existing_mode" = "ap" ]; then
-            if [ $found -eq 0 ]; then
-                found=1
-            else
-                uci delete wireless.wifinet$apnum
-            fi
-        fi
-        apnum=$((apnum + 1))
-    done
-    uci commit wireless
+#    # Check all existing wifinetX and remove if SSID matches with $mesh_id and mode is 'ap'
+#   while uci get wireless.wifinet$apnum > /dev/null 2>&1; do
+#        existing_ssid=$(uci get wireless.wifinet$apnum.ssid 2> /dev/null)
+#        existing_mode=$(uci get wireless.wifinet$apnum.mode 2> /dev/null)
+#        if [ "$existing_ssid" = "$mesh_id" ] && [ "$existing_mode" = "ap" ]; then
+#            if [ $found -eq 0 ]; then
+#                found=1
+#            else
+#                uci delete wireless.wifinet$apnum
+#           fi
+#        fi
+#        apnum=$((apnum + 1))
+#    done
+#    uci commit wireless
+
 
     if [ $found -eq 0 ]; then
         uci set wireless.mesh_$apall.encryption='none'
-		uci set wireless.mesh_$apall.disabled='0'
+#       uci set wireless.mesh_$apall.disabled='0'
         uci set wireless.wifinet$apnum=wifi-iface
         uci set wireless.wifinet$apnum.device=$mesh_apRadio
         uci set wireless.wifinet$apnum.mode='ap'
@@ -135,30 +134,30 @@ else
     apnum=$((apnum + 1))
     found=0
 
-    # Check all existing wifinetX and remove if SSID matches with $mesh_id and mode is 'ap'
-    while uci get wireless.wifinet$apnum > /dev/null 2>&1; do
-        existing_ssid=$(uci get wireless.wifinet$apnum.ssid 2> /dev/null)
-        existing_mode=$(uci get wireless.wifinet$apnum.mode 2> /dev/null)
-        if [ "$existing_ssid" = "$mesh_id" ] && [ "$existing_mode" = "ap" ]; then
-            if [ $found -eq 0 ]; then
-                found=1
-            else
-                uci delete wireless.wifinet$apnum
-            fi
-        fi
-        apnum=$((apnum + 1))
-    done
-    uci commit wireless
+ #   # Check all existing wifinetX and remove if SSID matches with $mesh_id and mode is 'ap'
+ #   while uci get wireless.wifinet$apnum > /dev/null 2>&1; do
+ #       existing_ssid=$(uci get wireless.wifinet$apnum.ssid 2> /dev/null)
+ #       existing_mode=$(uci get wireless.wifinet$apnum.mode 2> /dev/null)
+ #       if [ "$existing_ssid" = "$mesh_id" ] && [ "$existing_mode" = "ap" ]; then
+ #           if [ $found -eq 0 ]; then
+ #               found=1
+ #           else
+ #               uci delete wireless.wifinet$apnum
+ #           fi
+ #       fi
+ #       apnum=$((apnum + 1))
+ #   done
+ #   uci commit wireless
 
     if [ $found -eq 0 ]; then
         uci set wireless.mesh_$apall.encryption='sae'
-		uci set wireless.mesh_$apall.disabled='0'
+#       uci set wireless.mesh_$apall.disabled='0'
         uci set wireless.mesh_$apall.key=$key
         uci set wireless.wifinet$apnum=wifi-iface
         uci set wireless.wifinet$apnum.device=$apall
         uci set wireless.wifinet$apnum.mode='ap'
         uci set wireless.wifinet$apnum.ssid=$mesh_id
-        uci set wireless.wifinet$apnum.encryption='psk2'
+        uci set wireless.wifinet$apnum.encryption='sae-mixed'
         uci set wireless.wifinet$apnum.key=$key
         uci set wireless.wifinet$apnum.ieee80211r='1'
         uci set wireless.wifinet$apnum.mobility_domain=$mobility_domain
@@ -273,6 +272,7 @@ set_easymesh() {
                 add_dawn
 
 
+
 if [ "$ap_mode" = 1 ]; then
 # Backup Configurations if your scared
 cp /etc/config/wireless /etc/config/wireless.backup
@@ -338,7 +338,6 @@ mv /etc/config/firewall /etc/config/firewall.unused
 #fi
 
 
-
                 else
                         ap_mode_stop
                 fi
@@ -388,4 +387,5 @@ stop() {
 
 restart() {
         set_easymesh
+        add_wifi_mesh
 }