diff options
| author | John Crispin <john@openwrt.org> | 2013-10-24 14:27:03 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2013-10-24 14:27:03 +0000 |
| commit | e37b364ea319b27caf9f8e3fc7805e9af73552b1 (patch) | |
| tree | e12486683f74bf05f66d2a64ae1c9cd614d4bab4 | |
| parent | e72c7e17a475c00134c56f4392578ddc16a47a2e (diff) | |
| download | upstream-e37b364ea319b27caf9f8e3fc7805e9af73552b1.tar.gz upstream-e37b364ea319b27caf9f8e3fc7805e9af73552b1.tar.bz2 upstream-e37b364ea319b27caf9f8e3fc7805e9af73552b1.zip | |
procd: update to latest git head
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 38529
| -rw-r--r-- | package/system/procd/Makefile | 4 | ||||
| -rw-r--r-- | package/system/procd/files/log.init | 2 |
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 } |