hurricos/openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rpcd: update to latest Git head

Browse Source 
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 4105555115,
 952b11766c and
 e533fb1706)
This commit is contained in:
Jo-Philipp Wich 2018-11-22 14:42:14 +01:00
parent 1cd945ea22
commit 629073e86d
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/system/rpcd/Makefile
View File

@ -12,10 +12,10 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/rpcd.git PKG_SOURCE_URL=$(PROJECT_GIT)/project/rpcd.git
PKG_SOURCE_DATE:=2018-08-16 PKG_SOURCE_DATE:=2018-11-28
PKG_SOURCE_VERSION:=41333abee4c57e3de2bcfa08972954e2af20705a PKG_SOURCE_VERSION:=3aa81d0dfae167eccc26203bd0c96f3e3450f253
PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io> PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
PKG_MIRROR_HASH:=a6d3c2228836a738919dfbd57a9e3ae5d427d5f94607b7e78b92b03f09f59731 PKG_MIRROR_HASH:=1befc5e1793a687e7a37b4f4d611e5f95aef4b79ad4b288c4dcb4c74d212509b
PKG_LICENSE:=ISC PKG_LICENSE:=ISC
PKG_LICENSE_FILES:= PKG_LICENSE_FILES:=

3
package/system/rpcd/files/rpcd.config
View File

@ -1,3 +1,6 @@
config rpcd
option socket /var/run/ubus.sock
option timeout 30
config login config login
option username 'root' option username 'root'

5
package/system/rpcd/files/rpcd.init
View File

@ -7,8 +7,11 @@ NAME=rpcd
PROG=/sbin/rpcd PROG=/sbin/rpcd
start_service() { start_service() {
local socket=$(uci -q get rpcd.@rpcd[0].socket)
local timeout=$(uci -q get rpcd.@rpcd[0].timeout)
procd_open_instance procd_open_instance
procd_set_param command "$PROG" procd_set_param command "$PROG" ${socket:+-s "$socket"} ${timeout:+-t "$timeout"}
procd_close_instance procd_close_instance
} }