procd: do not overwrite service data by default

Allows a running servie to manage its own data if untouched by the init script

Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit 8c5826b140b6288b9270d232ecda0d540e380d4e)

diff --git a/package/base-files/files/etc/rc.common b/package/base-files/files/etc/rc.common
index d7473038444cb1b6b4f58f408e3cbd2bfdd94f4b..abf72ea3372fe80b920d0c9a03b3e7d30b1a5ff9 100755 (executable)
--- a/package/base-files/files/etc/rc.common
+++ b/package/base-files/files/etc/rc.common
@@ -100,10 +100,6 @@ service_triggers() {
        return 0
 }
 
-service_data() {
-       return 0
-}
-
 service_running() {
        local instance="${1:-*}"
 

diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh
index 5dc8ec42b7a4ef7bdffba23acd3b8fbe28915cd9..59e002036d9558fb3afa83bb562a4ee8e90ed36a 100644 (file)
--- a/package/system/procd/files/procd.sh
+++ b/package/system/procd/files/procd.sh
@@ -101,9 +101,11 @@ _procd_close_service() {
        _procd_open_trigger
        service_triggers
        _procd_close_trigger
-       _procd_open_data
-       service_data
-       _procd_close_data
+       type service_data >/dev/null 2>&1 && {
+               _procd_open_data
+               service_data
+               _procd_close_data
+       }
        _procd_ubus_call ${1:-set}
 }