From 41055551151e12abf8efe710efa4dc025a7b7b6a Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 22 Nov 2018 14:42:14 +0100 Subject: [PATCH] rpcd: update to latest Git head 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 --- package/system/rpcd/Makefile | 6 +++--- package/system/rpcd/files/rpcd.config | 3 +++ package/system/rpcd/files/rpcd.init | 5 ++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/package/system/rpcd/Makefile b/package/system/rpcd/Makefile index fee2c5b33d..09146264cb 100644 --- a/package/system/rpcd/Makefile +++ b/package/system/rpcd/Makefile @@ -12,10 +12,10 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/rpcd.git -PKG_SOURCE_DATE:=2018-08-16 -PKG_SOURCE_VERSION:=41333abee4c57e3de2bcfa08972954e2af20705a +PKG_SOURCE_DATE:=2018-11-22 +PKG_SOURCE_VERSION:=2cc4b998ec78fc8fb9e12a5e67e71c34b2511719 PKG_MAINTAINER:=Jo-Philipp Wich -PKG_MIRROR_HASH:=a6d3c2228836a738919dfbd57a9e3ae5d427d5f94607b7e78b92b03f09f59731 +PKG_MIRROR_HASH:=6dcdaa1b9cc876a9dbe850ca52a04dcab23bd4530dad57640fd8e89df13a2a6b PKG_LICENSE:=ISC PKG_LICENSE_FILES:= diff --git a/package/system/rpcd/files/rpcd.config b/package/system/rpcd/files/rpcd.config index 499ea27628..faaed7f538 100644 --- a/package/system/rpcd/files/rpcd.config +++ b/package/system/rpcd/files/rpcd.config @@ -1,3 +1,6 @@ +config rpcd + option socket /var/run/ubus.sock + option timeout 30 config login option username 'root' 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 }