diff options
| author | Denis Osvald <denis.osvald@sartura.hr> | 2017-02-14 17:08:49 +0100 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2017-02-15 09:33:13 +0100 |
| commit | d9a358d562691fcc5b7a7dfe2a98f9c0d3dd7830 (patch) | |
| tree | 390360f0f6cd99e00323d174c8448df9e413f665 /package/system/procd/files | |
| parent | d57223259ba9662ea1c8095b7a8269b11816794f (diff) | |
| download | upstream-d9a358d562691fcc5b7a7dfe2a98f9c0d3dd7830.tar.gz upstream-d9a358d562691fcc5b7a7dfe2a98f9c0d3dd7830.tar.bz2 upstream-d9a358d562691fcc5b7a7dfe2a98f9c0d3dd7830.zip | |
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@sartura.hr>
Diffstat (limited to 'package/system/procd/files')
| -rw-r--r-- | package/system/procd/files/procd.sh | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh index a1b9f2f0e9..6347de57ab 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() { |