Merge branch 'main' into ben_main

Makefile

@@ -6,18 +6,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-easymesh
-PKG_VERSION:=2.8.12
+PKG_VERSION:=2.8.17
 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
 
-# Keep the config file safe
-define Package/luci-app-easymesh/conffiles
-/etc/config/easymesh
-endef
-
 include $(TOPDIR)/feeds/luci/luci.mk
 
 # call BuildPackage - OpenWrt buildroot signature

root/etc/config/easymesh

@@ -1,3 +0,0 @@
-
-config easymesh 'config'
-	option enabled '0'

root/etc/uci-defaults/luci-easymesh

@@ -1,5 +1,16 @@
 #!/bin/sh
 
+if [ ! -f /etc/config/easymesh ]; then
+    echo "Creating /etc/config/easymesh"
+    cat <<EOF > /etc/config/easymesh
+config easymesh 'config'
+        option enabled '0'
+EOF
+	reload_config
+else
+	echo "/etc/config/easymesh exists, skipping creation"
+fi
+
 uci -q batch <<-EOF >/dev/null
 	delete ucitrack.@easymesh[-1]
 	add ucitrack easymesh