treewide: fix procd service inactive

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

Reported-by: Lvc Revincx <[email protected]>
Signed-off-by: Tianling Shen <[email protected]>
(cherry picked from commit b1651c5d5444b990b58180a26d6e76779cbb88a9)

diff --git a/net/v2raya/files/v2raya.init b/net/v2raya/files/v2raya.init
index a8295b6f45076e344ce2d037d2e85ed4e670a454..9c207f7d947a03686572fcef93968ada9d8f9cef 100755 (executable)
--- 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 a24255e9d56d1cad99e315cbcae852f9960805cd..7e4b8a7dbdb1e16bd8c758af5d51aa5c20d6b085 100755 (executable)
--- 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