RepoMirrors
/
openwrt
mirror of git://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

procd: update to latest git head 

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 38022
This commit is contained in:
John Crispin 2013-09-17 21:45:24 +00:00
parent f12f4074af
commit 4f62127dea
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/system/procd/Makefile
View File

@ -1,14 +1,14 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=procd PKG_NAME:=procd
PKG_VERSION:=2013-09-10 PKG_VERSION:=2013-09-17
PKG_RELEASE=$(PKG_SOURCE_VERSION)-1 PKG_RELEASE=$(PKG_SOURCE_VERSION)-1
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=git://nbd.name/luci2/procd.git PKG_SOURCE_URL:=git://nbd.name/luci2/procd.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=824a4b3da2c0be19ccf54a48dcd4c10677b82c1a PKG_SOURCE_VERSION:=f51f9cc5738d340423e44e678829402b367cf866
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
CMAKE_INSTALL:=1 CMAKE_INSTALL:=1

20
package/system/procd/files/procd.sh
View File

@ -12,6 +12,7 @@
# procd_set_param(type, [value...]) # procd_set_param(type, [value...])
# Available types: # Available types:
# command: command line (array). # command: command line (array).
# respawn info: array with 3 values $restart_timeout $fail_hreshold $max_fail
# env: environment variable (passed to the process) # env: environment variable (passed to the process)
# data: arbitrary name/value pairs for detecting config changes (table) # data: arbitrary name/value pairs for detecting config changes (table)
# file: configuration files (array) # file: configuration files (array)
@ -123,7 +124,7 @@ _procd_set_param() {
env|data) env|data)
_procd_add_table "$type" "$@" _procd_add_table "$type" "$@"
;; ;;
command|netdev|file) command|netdev|file|respawn)
_procd_add_array "$type" "$@" _procd_add_array "$type" "$@"
;; ;;
nice) nice)
@ -153,6 +154,20 @@ _procd_add_config_trigger() {
json_close_array json_close_array
} }
_procd_add_reload_trigger() {
local script=$(readlink "$initscript")
local name=$(basename ${script:-$initscript})
_procd_add_config_trigger $1 /etc/init.d/$name reload
}
_procd_add_reload_trigger() {
local script=$(readlink "$initscript")
local name=$(basename ${script:-$initscript})
_procd_add_config_trigger $1 /etc/init.d/$name reload
}
_procd_append_param() { _procd_append_param() {
local type="$1"; shift local type="$1"; shift
@ -161,7 +176,7 @@ _procd_append_param() {
env|data) env|data)
_procd_add_table_data "$@" _procd_add_table_data "$@"
;; ;;
command|netdev|file) command|netdev|file|respawn)
_procd_add_array_data "$@" _procd_add_array_data "$@"
;; ;;
esac esac
@ -197,6 +212,7 @@ _procd_wrapper \
procd_close_service \ procd_close_service \
procd_add_instance \ procd_add_instance \
procd_add_config_trigger \ procd_add_config_trigger \
procd_add_reload_trigger \
procd_open_trigger \ procd_open_trigger \
procd_close_trigger \ procd_close_trigger \
procd_open_instance \ procd_open_instance \