[source] procd: fix default timeout for reload trigger actions

LEDE Commits lede-commits at lists.infradead.org
Wed Feb 15 00:36:36 PST 2017


blogic pushed a commit to source.git, branch master:
https://git.lede-project.org/d9a358d562691fcc5b7a7dfe2a98f9c0d3dd7830

commit d9a358d562691fcc5b7a7dfe2a98f9c0d3dd7830
Author: Denis Osvald <denis.osvald at sartura.hr>
AuthorDate: Tue Feb 14 17:08:49 2017 +0100

    procd: fix default timeout for reload trigger actions
    
    Default trigger action timeout was added to procd.sh in commit f88e3a4c0
    (procd: add default timeout for reload trigger actions)
    However, the timeout value was not placed under the correct JSON-script
    array nesting level and thus did not apply.
    
    To fix this and make the timeout actually apply to the reload triggers,
    we place it in the correct scope, that is the per-trigger array.
    
    Fixes: f88e3a4c0abb60bb76a7678dd30dfdc8a808a2f1
    Signed-off-by: Denis Osvald <denis.osvald at sartura.hr>
---
 package/system/procd/files/procd.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh
index a1b9f2f..6347de5 100644
--- a/package/system/procd/files/procd.sh
+++ b/package/system/procd/files/procd.sh
@@ -251,9 +251,8 @@ _procd_add_interface_trigger() {
 	json_close_array
 
 	json_close_array
-	json_close_array
-
 	_procd_add_timeout
+	json_close_array
 }
 
 _procd_add_reload_interface_trigger() {
@@ -283,10 +282,8 @@ _procd_add_config_trigger() {
 	json_close_array
 
 	json_close_array
-
-	json_close_array
-
 	_procd_add_timeout
+	json_close_array
 }
 
 _procd_add_raw_trigger() {



More information about the lede-commits mailing list