Merge branch 'main' into ben_main

Makefile

@@ -5,9 +5,18 @@
 
 include $(TOPDIR)/rules.mk
 
+PKG_NAME:=luci-app-easymesh
+PKG_VERSION:=2.8.10
+PKG_RELEASE:=$(AUTORELEASE)
+PKG_MAINTAINER:=Jason Hawks <jason@torguard.net>
+
 LUCI_TITLE:=LuCI Support for easymesh
 LUCI_DEPENDS:= +kmod-cfg80211 +batctl-default +kmod-batman-adv +dawn +bash
-PKG_VERSION:=2.8.10
+
+# Keep the config file safe
+define Package/luci-app-easymesh/conffiles
+/etc/config/easymesh
+endef
 
 include $(TOPDIR)/feeds/luci/luci.mk
 

luasrc/model/cbi/easymesh.lua

@@ -139,36 +139,36 @@ ipmode = s:taboption("apmode", ListValue, "ipmode", translate("IP Mode"), transl
 ipmode:value("dhcp", translate("DHCP"))
 ipmode:value("static", translate("Static"))
 ipmode.default = "dhcp"
-ipmode:depends("role", "off")
+ipmode:depends({role="off",role="client"})
 
 -- Static IP address
 o = s:taboption("apmode", Value, "ipaddr", translate("Static IP Address"))
 o.default = "192.168.70.254"
 o.datatype = "ip4addr"
-o:depends({ipmode="static",role="off"})
+o:depends({ipmode="static",role="off",role="client"})
 
 -- DNS (Mesh Gateway IP Address)
 o = s:taboption("apmode", Value, "gateway", translate("Mesh Gateway IP Address"))
 o.default = "192.168.70.1"
 o.datatype = "ip4addr"
-o:depends({ipmode="static",role="off"})
+o:depends({ipmode="static",role="off",role="client"})
 
 -- IPv4 netmask
 o = s:taboption("apmode", Value, "netmask", translate("IPv4 netmask"))
 o.default = "255.255.255.0"
 o.datatype = "ip4addr"
-o:depends({ipmode="static",role="off"})
+o:depends({ipmode="static",role="off",role="client"})
 
 -- IPv4 netmask
 o = s:taboption("apmode", Value, "dns", translate("DNS Server"))
 o.default = "192.168.70.1"
 o.datatype = "ip4addr"
-o:depends({ipmode="static",role="off"})
+o:depends({ipmode="static",role="off"role="client"})
 
 btnAPMode = s:taboption("apmode", Button, "_btn_apmode", translate("Enable Dumb AP Mode"), translate("WARNING: THIS WILL CHANGE THIS NODE'S IP ADDRESS, YOU WILL LOOSE ACCESS TO THIS UI"))
 function btnAPMode.write()
     io.popen("/easymesh/easymesh.sh dumbap &")
 end
-btnAPMode:depends("role", "off")
+btnAPMode:depends({role="off",role="client"})
 
 return m