From: Felix Fietkau <nbd@nbd.name>
Date: Thu, 13 Mar 2025 09:11:56 +0000 (+0100)
Subject: package: use service_running instead of service_started for ubus config
X-Git-Tag: v25.12.0-rc1~3375
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a79cdc7ee2d5c12f3a19ab89c8821d8672c1080;p=thirdparty%2Fopenwrt.git

package: use service_running instead of service_started for ubus config

Fixes issue with loading config after a service crash. Should also improve
startup time.

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/package/libs/udebug/files/udebug.init b/package/libs/udebug/files/udebug.init
index b57e962f6fa..a9c92eee8fe 100755
--- a/package/libs/udebug/files/udebug.init
+++ b/package/libs/udebug/files/udebug.init
@@ -49,7 +49,7 @@ service_triggers() {
 	procd_add_reload_trigger udebug
 }
 
-service_started() {
+service_running() {
 	ubus -t 10 wait_for udebug
 	[ $? = 0 ] && reload_service
 }
diff --git a/package/network/config/qosify/files/qosify.init b/package/network/config/qosify/files/qosify.init
index f676d92a52e..8c1ca7d29e6 100644
--- a/package/network/config/qosify/files/qosify.init
+++ b/package/network/config/qosify/files/qosify.init
@@ -165,7 +165,7 @@ start_service() {
 	procd_close_instance
 }
 
-service_started() {
+service_running() {
 	ubus -t 10 wait_for qosify
 	[ $? = 0 ] && reload_service
 }
diff --git a/package/network/services/bridger/files/bridger.init b/package/network/services/bridger/files/bridger.init
index 057b18a94f4..feb3e5c3791 100644
--- a/package/network/services/bridger/files/bridger.init
+++ b/package/network/services/bridger/files/bridger.init
@@ -43,7 +43,7 @@ start_service() {
 	procd_close_instance
 }
 
-service_started() {
+service_running() {
 	ubus -t 10 wait_for bridger
 	[ $? = 0 ] && reload_service
 }
diff --git a/package/network/services/omcproxy/files/omcproxy.init b/package/network/services/omcproxy/files/omcproxy.init
index 757b7794ef3..e2792a8956d 100644
--- a/package/network/services/omcproxy/files/omcproxy.init
+++ b/package/network/services/omcproxy/files/omcproxy.init
@@ -157,7 +157,7 @@ start_service() {
 	echo 128 > /proc/sys/net/ipv4/igmp_max_memberships
 }
 
-service_started() {
+service_running() {
 	procd_set_config_changed firewall
 }
 
diff --git a/package/network/services/umdns/files/umdns.init b/package/network/services/umdns/files/umdns.init
index 61b2a338d67..87a6f8e16d1 100644
--- a/package/network/services/umdns/files/umdns.init
+++ b/package/network/services/umdns/files/umdns.init
@@ -66,7 +66,7 @@ start_service() {
 	procd_close_instance
 }
 
-service_started() {
+service_running() {
 	ubus -t 10 wait_for umdns
 	[ $? = 0 ] && reload_service
 }