Merge branch 'main' into ben_main

Makefile

@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI Support for easymesh
 LUCI_DEPENDS:= +kmod-cfg80211 +batctl-default +kmod-batman-adv +dawn +bash
-PKG_VERSION:=2.8.8
+PKG_VERSION:=2.8.9
 
 include $(TOPDIR)/feeds/luci/luci.mk
 

luasrc/model/cbi/easymesh.lua

@@ -228,9 +228,9 @@ btnAPMode:depends("role", "off")
 m.on_before_apply = function(self)
     local enabled = m:formvalue("cbid.easymesh.config.enabled")
     if enabled and enabled == "1" then
-        io.popen("/easymesh/easymesh.sh enable &")
+        luci.sys.call("/easymesh/easymesh.sh enable &")
     else
-        io.popen("/easymesh/easymesh.sh disable &")
+        luci.sys.call("/easymesh/easymesh.sh disable &")
     end
 end
 

root/easymesh/easymesh.sh

@@ -361,7 +361,7 @@ setup_mesh_radio() {
 
     # Check if ap_mode_enabled is enabled, if so add private_router_batman to the network
     # otherwise just add lan
-    if [ "$(uci -q get easymesh.config.ap_mode_enabled)" = 1 ]; then
+    if [ "$(uci -q get easymesh.config.ap_mode_enabled)" = 0 ]; then
         uci set wireless.wifinet$RADIO_NUM.network='lan'
     else
         uci set wireless.wifinet$RADIO_NUM.network='lan private_router_batman'