From: Felix Fietkau Date: Fri, 29 Jul 2016 12:19:17 +0000 (+0200) Subject: procd: add default timeout for reload trigger actions X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=f88e3a4c0;p=openwrt%2Fstaging%2Fwigyori.git procd: add default timeout for reload trigger actions Signed-off-by: Felix Fietkau --- diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh index 693a045be5..fa6f8a9792 100644 --- a/package/system/procd/files/procd.sh +++ b/package/system/procd/files/procd.sh @@ -32,6 +32,7 @@ . $IPKG_INSTROOT/usr/share/libubox/jshn.sh +PROCD_RELOAD_DELAY=1000 _PROCD_SERVICE= _procd_call() { @@ -221,6 +222,11 @@ _procd_set_param() { esac } +_procd_add_timeout() { + [ "$PROCD_RELOAD_DELAY" -gt 0 ] && json_add_int "" "$PROCD_RELOAD_DELAY" + return 0 +} + _procd_add_interface_trigger() { json_add_array _procd_add_array_data "$1" @@ -240,6 +246,8 @@ _procd_add_interface_trigger() { json_close_array json_close_array + + _procd_add_timeout } _procd_add_reload_interface_trigger() { @@ -271,6 +279,8 @@ _procd_add_config_trigger() { json_close_array json_close_array + + _procd_add_timeout } _procd_add_raw_trigger() {