diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2018-11-22 14:42:14 +0100 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2018-12-12 16:35:55 +0100 |
| commit | 629073e86d9f43e24819e18c25c9eb63801a65a0 (patch) | |
| tree | b026d9abde2f980b644eef4df3a9eb9975014209 | |
| parent | 1cd945ea2289f5b6047351da09d8cc2338bb002d (diff) | |
| download | upstream-629073e86d9f43e24819e18c25c9eb63801a65a0.tar.gz upstream-629073e86d9f43e24819e18c25c9eb63801a65a0.tar.bz2 upstream-629073e86d9f43e24819e18c25c9eb63801a65a0.zip | |
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 <jo@mein.io>
(cherry picked from commits 41055551151e12abf8efe710efa4dc025a7b7b6a,
952b11766cd83898cf8f9626b75141eac6d4ad1a and
e533fb17061027dca2cc60a9555fc2edb9e832eb)
| -rw-r--r-- | package/system/rpcd/Makefile | 6 | ||||
| -rw-r--r-- | package/system/rpcd/files/rpcd.config | 3 | ||||
| -rwxr-xr-x | 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..14cbdaf9c6 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-28 +PKG_SOURCE_VERSION:=3aa81d0dfae167eccc26203bd0c96f3e3450f253 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io> -PKG_MIRROR_HASH:=a6d3c2228836a738919dfbd57a9e3ae5d427d5f94607b7e78b92b03f09f59731 +PKG_MIRROR_HASH:=1befc5e1793a687e7a37b4f4d611e5f95aef4b79ad4b288c4dcb4c74d212509b 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 } |