diff options
author | Pierre Lebleu <pierre.lebleu@technicolor.com> | 2016-10-13 12:52:05 +0200 |
---|---|---|
committer | John Crispin <john@phrozen.org> | 2016-10-18 08:53:38 +0200 |
commit | 6bb11d52f3ae8ce8aa0a270c6ae305809af8b7ce (patch) | |
tree | 2491fa80239961cdb2b555b6d6d79848bdd3ea69 | |
parent | 5c96200dabe9190bc69ee0380ebbf0de4e0810f5 (diff) | |
download | upstream-6bb11d52f3ae8ce8aa0a270c6ae305809af8b7ce.tar.gz upstream-6bb11d52f3ae8ce8aa0a270c6ae305809af8b7ce.tar.bz2 upstream-6bb11d52f3ae8ce8aa0a270c6ae305809af8b7ce.zip |
procd: Allow initscripts to start one daemon instance at a time
Signed-off-by: Pierre Lebleu <pierre.lebleu@technicolor.com>
-rwxr-xr-x | package/base-files/files/etc/rc.common | 4 | ||||
-rw-r--r-- | package/system/procd/files/procd.sh | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/package/base-files/files/etc/rc.common b/package/base-files/files/etc/rc.common index e0de073733..95cf956366 100755 --- a/package/base-files/files/etc/rc.common +++ b/package/base-files/files/etc/rc.common @@ -102,9 +102,11 @@ ${INIT_TRACE:+set -x} . $IPKG_INSTROOT/lib/functions/procd.sh basescript=$(readlink "$initscript") rc_procd() { + local method="set" + [ -n "$2" ] && method="add" procd_open_service "$(basename ${basescript:-$initscript})" "$initscript" "$@" - procd_close_service + procd_close_service "$method" } start() { diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh index fa6f8a9792..290c90eb81 100644 --- a/package/system/procd/files/procd.sh +++ b/package/system/procd/files/procd.sh @@ -76,7 +76,7 @@ _procd_close_service() { _procd_open_trigger service_triggers _procd_close_trigger - _procd_ubus_call set + _procd_ubus_call ${1:-set} } _procd_add_array_data() { |