From 629073e86d9f43e24819e18c25c9eb63801a65a0 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 22 Nov 2018 14:42:14 +0100 Subject: rpcd: update to latest Git head 3aa81d0 file: access exec timeout via daemon ops structure 7235f34 plugin: store pointer to exec timeout value in the ops structure ccd7c0a treewide: rename exec_timeout to rpc_exec_timeout c79ef22 main: fix logic bug when not specifying a timeout option 2cc4b99 file: use global exec timeout instead of own hardcoded limit ecd1660 exec: increase maximum execution time to 120s Also expose the socket and timeout options in /etc/config/rpcd for easier use. Signed-off-by: Jo-Philipp Wich (cherry picked from commits 41055551151e12abf8efe710efa4dc025a7b7b6a, 952b11766cd83898cf8f9626b75141eac6d4ad1a and e533fb17061027dca2cc60a9555fc2edb9e832eb) --- package/system/rpcd/files/rpcd.init | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'package/system/rpcd/files/rpcd.init') diff --git a/package/system/rpcd/files/rpcd.init b/package/system/rpcd/files/rpcd.init index 98b633365b..0a37ee19f9 100755 --- a/package/system/rpcd/files/rpcd.init +++ b/package/system/rpcd/files/rpcd.init @@ -7,8 +7,11 @@ NAME=rpcd PROG=/sbin/rpcd start_service() { + local socket=$(uci -q get rpcd.@rpcd[0].socket) + local timeout=$(uci -q get rpcd.@rpcd[0].timeout) + procd_open_instance - procd_set_param command "$PROG" + procd_set_param command "$PROG" ${socket:+-s "$socket"} ${timeout:+-t "$timeout"} procd_close_instance } -- cgit v1.2.3