diff options
Diffstat (limited to 'package/system/ubox')
| -rw-r--r-- | package/system/ubox/Makefile | 12 | ||||
| -rw-r--r-- | package/system/ubox/files/log.init | 61 |
2 files changed, 68 insertions, 5 deletions
diff --git a/package/system/ubox/Makefile b/package/system/ubox/Makefile index c913231505..15d222cb4e 100644 --- a/package/system/ubox/Makefile +++ b/package/system/ubox/Makefile @@ -1,13 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ubox -PKG_VERSION:=2013-11-07.1 -PKG_RELEASE=$(PKG_SOURCE_VERSION)-1 +PKG_VERSION:=2013-11-16 +PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=git://nbd.name/luci2/ubox.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=0588218d4bc58b0e099272338decbe4734f5678b +PKG_SOURCE_VERSION:=b5dc53828bc69611cb474c95c9b23e70a2288391 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz CMAKE_INSTALL:=1 @@ -36,9 +36,11 @@ define Package/block-mount endef define Package/ubox/install - $(INSTALL_DIR) $(1)/sbin $(1)/usr/sbin + $(INSTALL_DIR) $(1)/sbin $(1)/usr/sbin $(1)/lib/ $(1)/etc/init.d/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{mount_root,kmodloader} $(1)/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{mount_root,kmodloader,logd,logread,validate_data} $(1)/sbin/ + $(INSTALL_BIN) ./files/log.init $(1)/etc/init.d/log + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libvalidate.so $(1)/lib ln -s /sbin/mount_root $(1)/sbin/switch2jffs ln -s /sbin/mount_root $(1)/sbin/jffs2reset ln -s /sbin/mount_root $(1)/sbin/jffs2mark diff --git a/package/system/ubox/files/log.init b/package/system/ubox/files/log.init new file mode 100644 index 0000000000..7676ec379b --- /dev/null +++ b/package/system/ubox/files/log.init @@ -0,0 +1,61 @@ +#!/bin/sh /etc/rc.common +# Copyright (C) 2013 OpenWrt.org + +# start after and stop before networking +START=12 +STOP=89 + +USE_PROCD=1 +PROG=/sbin/logread + +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 +} + +start_service_remote() +{ + local pid_file="/var/run/logread.${PIDCOUNT}.pid" + local log_ip log_port log_proto + + 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 +} + +service_triggers() +{ + procd_add_config_trigger "system" "/etc/init.d/log" "start" +} + +start_service() +{ + procd_open_instance + procd_set_param command "/sbin/logd" + procd_set_param respawn + procd_close_instance + + config_load system + config_foreach start_service_file system + config_foreach start_service_remote system +} |