From: John Crispin <john@openwrt.org>
Date: Mon, 8 Jul 2013 16:35:19 +0000 (+0000)
Subject: procd: update to latest git revision
X-Git-Tag: reboot~10000
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9004e560fe786267d8df36fd32d9473819d9e3f4;p=oweals%2Fopenwrt.git

procd: update to latest git revision

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

SVN-Revision: 37206
---

diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile
index fdc7293a99..27879e8443 100644
--- a/package/system/procd/Makefile
+++ b/package/system/procd/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=procd
-PKG_VERSION:=2013-07-04
+PKG_VERSION:=2013-07-08
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://nbd.name/luci2/procd.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=3283d681f9da65b500ad0cb3d4550cb840ed481a
+PKG_SOURCE_VERSION:=725e6bbbe403a950c0ddcd23cb521ffefa705c7d
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 CMAKE_INSTALL:=1
 
@@ -29,9 +29,10 @@ define Package/procd
 endef
 
 define Package/procd/install
-	$(INSTALL_DIR) $(1)/sbin $(1)/lib/functions $(1)/etc
+	$(INSTALL_DIR) $(1)/sbin $(1)/lib/functions $(1)/etc/init.d
 
 	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/{procd,askfirst,udevtrigger,logread} $(1)/sbin/
+	$(INSTALL_BIN) ./files/log.init $(1)/etc/init.d/log
 	$(INSTALL_DATA) ./files/hotplug*.json $(1)/etc/
 	$(INSTALL_DATA) ./files/procd.sh $(1)/lib/functions/
 	ln -s /sbin/procd $(1)/sbin/init
diff --git a/package/system/procd/files/log.init b/package/system/procd/files/log.init
new file mode 100644
index 0000000000..2f31d53317
--- /dev/null
+++ b/package/system/procd/files/log.init
@@ -0,0 +1,53 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2013 OpenWrt.org
+
+# start after and stop before networking
+START=21
+STOP=89
+
+USE_PROCD=1
+NAME=logread
+PROG=/sbin/logread
+PIDCOUNT=1
+
+start_service_file()
+{
+	local pid_file="/var/run/logread.${PIDCOUNT}.pid"
+	local log_file log_size
+
+	config_get log_file $1 log_file
+        config_get log_size $1 log_size
+
+	[ -z "${log_file}" ] && return
+
+	procd_open_instance
+	procd_set_param command "$PROG" -f -F "$log_file" -p "$pid_file"
+        [ -n "${log_size}" ] && procd_append_param command -S "$log_size"
+	procd_close_instance
+
+	PIDCOUNT="$(( ${PIDCOUNT} + 1))"
+}
+
+start_service_remote()
+{
+	local pid_file="/var/run/logread.${PIDCOUNT}.pid"
+	local log_ip log_port
+
+	config_get log_ip $1 log_ip
+	config_get log_port $1 log_port
+
+	[ -z "${log_port}" -o -z "${log_ip}" ] && return
+
+	procd_open_instance
+	procd_set_param command "$PROG" -f -r "$log_ip" "$log_port" -p "$pid_file"
+	procd_close_instance
+
+	PIDCOUNT="$(( ${PIDCOUNT} + 1))"
+}
+
+start_service()
+{
+	config_load system
+	config_foreach start_service_file system
+	config_foreach start_service_remote system
+}