aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2013-09-17 21:45:24 +0000
committerJohn Crispin <blogic@openwrt.org>2013-09-17 21:45:24 +0000
commit021ff1b2d2678f1708c9fd86747c229f0ed227c0 (patch)
tree87687ec02f332070333bf4a7759f93813bebcef1
parent751f92881546b07452e922ad15be9d446f23f592 (diff)
downloadupstream-021ff1b2d2678f1708c9fd86747c229f0ed227c0.tar.gz
upstream-021ff1b2d2678f1708c9fd86747c229f0ed227c0.tar.bz2
upstream-021ff1b2d2678f1708c9fd86747c229f0ed227c0.zip
procd: update to latest git head
Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38022 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/system/procd/Makefile4
-rw-r--r--package/system/procd/files/procd.sh20
2 files changed, 20 insertions, 4 deletions
diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile
index a8e58e2270..d142573e21 100644
--- a/package/system/procd/Makefile
+++ b/package/system/procd/Makefile
@@ -1,14 +1,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=procd
-PKG_VERSION:=2013-09-10
+PKG_VERSION:=2013-09-17
PKG_RELEASE=$(PKG_SOURCE_VERSION)-1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=git://nbd.name/luci2/procd.git
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
CMAKE_INSTALL:=1
diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh
index 096eb2de32..b65bf293d6 100644
--- a/package/system/procd/files/procd.sh
+++ b/package/system/procd/files/procd.sh
@@ -12,6 +12,7 @@
# procd_set_param(type, [value...])
# Available types:
# command: command line (array).
+# respawn info: array with 3 values $restart_timeout $fail_hreshold $max_fail
# env: environment variable (passed to the process)
# data: arbitrary name/value pairs for detecting config changes (table)
# file: configuration files (array)
@@ -123,7 +124,7 @@ _procd_set_param() {
env|data)
_procd_add_table "$type" "$@"
;;
- command|netdev|file)
+ command|netdev|file|respawn)
_procd_add_array "$type" "$@"
;;
nice)
@@ -153,6 +154,20 @@ _procd_add_config_trigger() {
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() {
local type="$1"; shift
@@ -161,7 +176,7 @@ _procd_append_param() {
env|data)
_procd_add_table_data "$@"
;;
- command|netdev|file)
+ command|netdev|file|respawn)
_procd_add_array_data "$@"
;;
esac
@@ -197,6 +212,7 @@ _procd_wrapper \
procd_close_service \
procd_add_instance \
procd_add_config_trigger \
+ procd_add_reload_trigger \
procd_open_trigger \
procd_close_trigger \
procd_open_instance \