From 9a79cdc7ee2d5c12f3a19ab89c8821d8672c1080 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 13 Mar 2025 10:11:56 +0100 Subject: [PATCH] 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 --- package/libs/udebug/files/udebug.init | 2 +- package/network/config/qosify/files/qosify.init | 2 +- package/network/services/bridger/files/bridger.init | 2 +- package/network/services/omcproxy/files/omcproxy.init | 2 +- package/network/services/umdns/files/umdns.init | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/libs/udebug/files/udebug.init b/package/libs/udebug/files/udebug.init index b57e962f6f..a9c92eee8f 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 f676d92a52..8c1ca7d29e 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 057b18a94f..feb3e5c379 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 757b7794ef..e2792a8956 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 61b2a338d6..87a6f8e16d 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 }