diff options
| author | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2014-01-19 19:10:09 +0000 |
|---|---|---|
| committer | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2014-01-19 19:10:09 +0000 |
| commit | 5965ab4000c94979cd3ff55dcc7d94ce9cf90057 (patch) | |
| tree | f5e98ca3a81aa5160c2ec6423aaed745dac2e5f1 /package/system | |
| parent | 4f59c2a56269288f8ff3d98222f544b6d4540291 (diff) | |
ubox: update to latest git head
adds option to set internal buffer size
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39333 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/system')
| -rw-r--r-- | package/system/ubox/Makefile | 4 | ||||
| -rw-r--r-- | package/system/ubox/files/log.init | 29 |
2 files changed, 26 insertions, 7 deletions
diff --git a/package/system/ubox/Makefile b/package/system/ubox/Makefile index 2ed4c6336e..68ad3b66cd 100644 --- a/package/system/ubox/Makefile +++ b/package/system/ubox/Makefile @@ -1,13 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ubox -PKG_VERSION:=2014-01-17 +PKG_VERSION:=2014-01-19 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:=6a5ff020909d005ad014810b2b7b60aabe9d7ed0 +PKG_SOURCE_VERSION:=dee0eafbf7de74b45f90631b7c807395e0a0bc4b PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz CMAKE_INSTALL:=1 diff --git a/package/system/ubox/files/log.init b/package/system/ubox/files/log.init index 548f9632bf..a00f73de10 100644 --- a/package/system/ubox/files/log.init +++ b/package/system/ubox/files/log.init @@ -21,6 +21,29 @@ validate_log_section() return $? } +validate_log_daemon() +{ + uci_validate_section system system "${1}" \ + 'log_size:uinteger' + return $? +} + +start_service_daemon() +{ + local log_size + + validate_log_daemon "${1}" || { + echo "validation failed" + return 1 + } + + procd_open_instance + procd_set_param command "/sbin/logd" + [ -n "${log_size}" ] && procd_append_param command -S "$log_size" + procd_set_param respawn + procd_close_instance +} + start_service_file() { PIDCOUNT="$(( ${PIDCOUNT} + 1))" @@ -66,12 +89,8 @@ service_triggers() 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_daemon system config_foreach start_service_file system config_foreach start_service_remote system } |