aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2013-10-24 14:27:03 +0000
committerJohn Crispin <blogic@openwrt.org>2013-10-24 14:27:03 +0000
commit18c8dafa90c8b31baee68c0fb8c7abe1a59c443a (patch)
tree33446e0fae772005ad85341a79b3e7c024ca4886
parentbdc2e671912c3737ec65454cc7a5ed91213f7e01 (diff)
downloadupstream-18c8dafa90c8b31baee68c0fb8c7abe1a59c443a.tar.gz
upstream-18c8dafa90c8b31baee68c0fb8c7abe1a59c443a.tar.bz2
upstream-18c8dafa90c8b31baee68c0fb8c7abe1a59c443a.zip
procd: update to latest git head
Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38529 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/system/procd/Makefile4
-rw-r--r--package/system/procd/files/log.init2
2 files changed, 4 insertions, 2 deletions
diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile
index e5793f1b7f..ecff65f0bf 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-10-01
+PKG_VERSION:=2013-10-09
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:=eba428f6672068d819d6296db3f635e6ac5a8be7
+PKG_SOURCE_VERSION:=d5ee716c3519c024afdd0dd16362c99665d8bc60
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
CMAKE_INSTALL:=1
diff --git a/package/system/procd/files/log.init b/package/system/procd/files/log.init
index d0e3025714..cd7d9965a0 100644
--- a/package/system/procd/files/log.init
+++ b/package/system/procd/files/log.init
@@ -32,12 +32,14 @@ start_service_remote()
config_get log_ip $1 log_ip
config_get log_port $1 log_port
config_get log_proto $1 log_proto udp
+ config_get log_prefix $1 log_prefix
[ -z "${log_ip}" ] && return
procd_open_instance
procd_set_param command "$PROG" -f -r "$log_ip" "${log_port:-514}" -p "$pid_file"
[ "${log_proto}" != "udp" ] || procd_append_param command -u
+ [ -z "${log_prefix}" ] || procd_append_param command -P ${log_prefix}
procd_close_instance
}