summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau2024-12-17 20:21:37 +0000
committerFelix Fietkau2024-12-17 20:54:54 +0000
commit8c5826b140b6288b9270d232ecda0d540e380d4e (patch)
treec4b783fcda72a6e04f1320b944aaefe07fe72e5a
parent3d900bd055b5d8f07a879c9c8c4f7783d35dd4ba (diff)
downloadopenwrt-8c5826b140b6288b9270d232ecda0d540e380d4e.tar.gz
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>
-rwxr-xr-xpackage/base-files/files/etc/rc.common4
-rw-r--r--package/system/procd/files/procd.sh8
2 files changed, 5 insertions, 7 deletions
diff --git a/package/base-files/files/etc/rc.common b/package/base-files/files/etc/rc.common
index d747303844..abf72ea337 100755
--- 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 5dc8ec42b7..59e002036d 100644
--- 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}
}