From: Pierre Lebleu <pierre.lebleu@technicolor.com>
Date: Thu, 13 Oct 2016 10:52:05 +0000 (+0200)
Subject: procd: Allow initscripts to start one daemon instance at a time
X-Git-Tag: v17.01.0-rc1~1112
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=6bb11d52f3ae8ce8aa0a270c6ae305809af8b7ce

procd: Allow initscripts to start one daemon instance at a time

Signed-off-by: Pierre Lebleu <pierre.lebleu@technicolor.com>
---

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() {