KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

procd: fix default timeout for reload trigger actions

Browse source 
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: f88e3a4c0a
Signed-off-by: Denis Osvald <denis.osvald@sartura.hr>
This commit is contained in:
Denis Osvald 2017-02-14 17:08:49 +01:00 committed by John Crispin
parent d57223259b
commit d9a358d562
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
package/system/procd/files/procd.sh
View file

@ -251,9 +251,8 @@ _procd_add_interface_trigger() {
json_close_array json_close_array
json_close_array json_close_array
json_close_array
_procd_add_timeout _procd_add_timeout
json_close_array
} }
_procd_add_reload_interface_trigger() { _procd_add_reload_interface_trigger() {
@ -283,10 +282,8 @@ _procd_add_config_trigger() {
json_close_array json_close_array
json_close_array json_close_array
json_close_array
_procd_add_timeout _procd_add_timeout
json_close_array
} }
_procd_add_raw_trigger() { _procd_add_raw_trigger() {