From: Tianling Shen <redacted>
Date: Mon, 17 Oct 2022 12:46:28 +0000 (+0800)
Subject: treewide: fix procd service inactive
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=b1651c5d5444b990b58180a26d6e76779cbb88a9;p=openwrt-packages.git

treewide: fix procd service inactive

Exit directly will result procd service inactive and uci
configuration changes are no longer monitored.

Reported-by: Lvc Revincx <redacted>
Signed-off-by: Tianling Shen <redacted>
---

diff --git a/net/cloudflared/files/cloudflared.init b/net/cloudflared/files/cloudflared.init
index fdf028618..4fac31aac 100755
--- a/net/cloudflared/files/cloudflared.init
+++ b/net/cloudflared/files/cloudflared.init
@@ -18,7 +18,7 @@ start_service() {
 
 	local enabled
 	config_get_bool enabled "config" "enabled"
-	[ "$enabled" -eq "1" ] || exit 1
+	[ "$enabled" -eq "1" ] || return 1
 
 	procd_open_instance "$CONF"
 	procd_set_param command "$PROG" "tunnel"
diff --git a/net/dnsproxy/files/dnsproxy.init b/net/dnsproxy/files/dnsproxy.init
index 9ac2751b3..1514ee152 100644
--- a/net/dnsproxy/files/dnsproxy.init
+++ b/net/dnsproxy/files/dnsproxy.init
@@ -88,7 +88,7 @@ load_config_param() {
 start_service() {
 	config_load "$CONF"
 
-	is_enabled "global" "enabled" || exit 1
+	is_enabled "global" "enabled" || return 1
 
 	procd_open_instance "$CONF"
 	procd_set_param command "$PROG"
diff --git a/net/v2ray-core/files/v2ray.init b/net/v2ray-core/files/v2ray.init
index e43f51183..c19bd9cab 100755
--- a/net/v2ray-core/files/v2ray.init
+++ b/net/v2ray-core/files/v2ray.init
@@ -11,7 +11,7 @@ start_service() {
 
 	local enabled
 	config_get_bool enabled "enabled" "enabled" "0"
-	[ "$enabled" -eq "0" ] && exit 1
+	[ "$enabled" -eq "1" ] || return 1
 
 	local confdir
 	local conffiles
diff --git a/net/v2raya/files/v2raya.init b/net/v2raya/files/v2raya.init
index a8295b6f4..9c207f7d9 100755
--- a/net/v2raya/files/v2raya.init
+++ b/net/v2raya/files/v2raya.init
@@ -34,7 +34,7 @@ append_env_bool() {
 start_service() {
 	config_load "$CONF"
 
-	is_enabled "config" "enabled" || exit 1
+	is_enabled "config" "enabled" || return 1
 
 	procd_open_instance "$CONF"
 	procd_set_param command "$PROG"
diff --git a/net/xray-core/files/xray.init b/net/xray-core/files/xray.init
index a24255e9d..7e4b8a7db 100755
--- a/net/xray-core/files/xray.init
+++ b/net/xray-core/files/xray.init
@@ -10,8 +10,8 @@ start_service() {
 	config_load "$CONF"
 
 	local enabled
-	config_get enabled "enabled" "enabled" "0"
-	[ "$enabled" -eq "0" ] && exit 1
+	config_get_bool enabled "enabled" "enabled" "0"
+	[ "$enabled" -eq "1" ] || return 1
 
 	local confdir
 	local conffiles