diff options
| author | Felix Fietkau | 2024-12-17 20:21:37 +0000 |
|---|---|---|
| committer | Felix Fietkau | 2024-12-17 21:00:37 +0000 |
| commit | f760f742097d5317fa4e9e49b58625ceec9aa1a9 (patch) | |
| tree | 4b9ec434b0d9e7f173392b21dedf11cad2868386 | |
| parent | 5dca1d6a4183f8386ad29d93206ae4730bb6ed7b (diff) | |
| download | openwrt-f760f742097d5317fa4e9e49b58625ceec9aa1a9.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>
(cherry picked from commit 8c5826b140b6288b9270d232ecda0d540e380d4e)
| -rwxr-xr-x | package/base-files/files/etc/rc.common | 4 | ||||
| -rw-r--r-- | package/system/procd/files/procd.sh | 8 |
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} } |