Merge pull request #7056 from TDT-AG/pr/20240411-ucitrack

luci-base: conversion of ucitrack handling from uci to json

applications/luci-app-ahcp/root/usr/share/ucitrack/luci-app-ahcp.json

@@ -0,0 +1,4 @@
+{
+	"config": "ahcpd",
+	"init": "ahcpd"
+}

applications/luci-app-dynapoint/root/usr/share/ucitrack/luci-app-dynapoint.json

@@ -0,0 +1,4 @@
+{
+	"config": "dynapoint",
+	"init": "dynapoint"
+}

applications/luci-app-firewall/root/usr/share/ucitrack/luci-app-firewall.json

@@ -0,0 +1,9 @@
+{
+	"config": "firewall",
+	"init": "firewall",
+	"affects": [
+		"luci-splash",
+		"qos",
+		"miniupnpd"
+	]
+}

applications/luci-app-irqbalance/root/usr/share/ucitrack/luci-app-irqbalance.json

@@ -0,0 +1,4 @@
+{
+	"config": "irqbalance",
+	"init": "irqbalance"
+}

applications/luci-app-libreswan/root/usr/share/ucitrack/luci-app-libreswan.json

@@ -0,0 +1,4 @@
+{
+	"config": "libreswan",
+	"init": "ipsec"
+}

applications/luci-app-mwan3/root/etc/uci-defaults/60_luci-mwan3

@@ -1,11 +1,5 @@
 #!/bin/sh
 
-# remove existing mwan ucitrack entry is now done with procd
-uci -q batch <<-EOF >/dev/null
-	del ucitrack.@mwan3[-1]
-	commit ucitrack
-EOF
-
 uci -q get mwan3.globals >/dev/null || {
 	uci -q add mwan3 globals >/dev/null
 	uci -q rename mwan3.@globals[-1]="globals" >/dev/null

applications/luci-app-olsr/root/usr/share/ucitrack/luci-app-olsr.json

@@ -0,0 +1,4 @@
+{
+	"config": "olsrd",
+	"init": "olsrd"
+}

applications/luci-app-olsr/root/usr/share/ucitrack/luci-app-olsr6.json

@@ -0,0 +1,4 @@
+{
+	"config": "olsrd6",
+	"init": "olsrd6"
+}

applications/luci-app-p910nd/root/usr/share/ucitrack/luci-app-p910nd.json

@@ -0,0 +1,4 @@
+{
+	"config": "p910nd",
+	"init": "p910nd"
+}

applications/luci-app-polipo/root/usr/share/ucitrack/luci-app-polipo.json

@@ -0,0 +1,4 @@
+{
+	"config": "polipo",
+	"init": "polipo"
+}

applications/luci-app-qos/root/usr/share/ucitrack/luci-app-qos.json

@@ -0,0 +1,4 @@
+{
+	"config": "qos",
+	"init": "qos"
+}

applications/luci-app-samba4/root/usr/share/ucitrack/luci-app-samba4.json

@@ -0,0 +1,4 @@
+{
+	"config": "samba",
+	"init": "samba"
+}

applications/luci-app-splash/root/usr/share/ucitrack/luci-app-splash.json

@@ -0,0 +1,4 @@
+{
+	"config": "luci_splash",
+	"init": "luci_splash"
+}

applications/luci-app-sqm/root/usr/share/ucitrack/luci-app-sqm.json

@@ -0,0 +1,7 @@
+{
+	"config": "sqm",
+	"init": "sqm",
+	"affects": [
+		"sqm"
+	]
+}

applications/luci-app-tinyproxy/root/usr/share/ucitrack/luci-app-tinyproxy.json

@@ -0,0 +1,4 @@
+{
+	"config": "tinyproxy",
+	"init": "tinyproxy"
+}

applications/luci-app-upnp/root/usr/share/ucitrack/luci-app-upnp.json

@@ -0,0 +1,4 @@
+{
+	"config": "upnpd",
+	"init": "miniupnpd"
+}

applications/luci-app-watchcat/root/usr/share/ucitrack/luci-app-watchcat.json

@@ -0,0 +1,4 @@
+{
+	"config": "watchcat",
+	"init": "watchcat"
+}

modules/luci-base/Makefile

@@ -36,7 +36,6 @@ include $(INCLUDE_DIR)/host-build.mk
 define Package/luci-base/conffiles
 /etc/luci-uploads
 /etc/config/luci
-/etc/config/ucitrack
 endef
 
 define Package/luci-base/postinst

modules/luci-base/root/etc/init.d/ucitrack

@@ -3,6 +3,8 @@
 START=80
 USE_PROCD=1
 
+. "$IPKG_INSTROOT/usr/share/libubox/jshn.sh"
+
 register_init() {
 	local config="$1"
 	local init="$2"
@@ -15,13 +17,25 @@ register_init() {
 }
 
 register_trigger() {
-	local sid="$1"
+	local uci="$1"
+	local file="$2"
+
 	local config init exec affects affected
+	local prev
 
-	config_get config "$sid" TYPE
-	config_get init "$sid" init
-	config_get exec "$sid" exec
-	config_get affects "$sid" affects
+	json_set_namespace config prev
+	json_init
+	json_load_file "${file}" >/dev/null 2>&1
+	json_get_var config 'config'
+	[ "$config" = "$uci" ] || {
+		json_set_namespace "$prev"
+		return
+	}
+	json_get_var init 'init'
+	json_get_var exec 'exec'
+	json_get_values affects 'affects'
+	json_cleanup
+	json_set_namespace "$prev"
 
 	if [ -n "$init" ]; then
 		register_init "$config" "/etc/init.d/$init" "reload"
@@ -48,10 +62,19 @@ register_trigger() {
 	done
 }
 
-service_triggers() {
-	config_foreach register_trigger
+check_trigger() {
+	local config="$1"
+
+	local file
+
+	for file in /usr/share/ucitrack/*.json; do
+		[ -f "$file" ] || continue
+		register_trigger "$config" "$file"
+	done
 }
 
-start_service() {
-	config_load ucitrack
+service_triggers() {
+	for config in /etc/config/*; do
+		check_trigger "${config##*/}"
+	done
 }