diff options
| author | John Crispin <blogic@openwrt.org> | 2014-01-22 15:33:16 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2014-01-22 15:33:16 +0000 |
| commit | 27a8f6583e65734b507bc1d208cb89b76909b3b8 (patch) | |
| tree | 8c360a3d4f3c25229b4306a854665f2036a7fc44 | |
| parent | 5e6bed3d037caeaec79b4ea8e4502602daedb352 (diff) | |
| download | upstream-27a8f6583e65734b507bc1d208cb89b76909b3b8.tar.gz upstream-27a8f6583e65734b507bc1d208cb89b76909b3b8.tar.bz2 upstream-27a8f6583e65734b507bc1d208cb89b76909b3b8.zip | |
ubox: revert log buffer size changes
the fix horribly broke existing setups
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39366 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/system/ubox/Makefile | 4 | ||||
| -rw-r--r-- | package/system/ubox/files/log.init | 29 |
2 files changed, 7 insertions, 26 deletions
diff --git a/package/system/ubox/Makefile b/package/system/ubox/Makefile index 5aeedfca18..ae26e98650 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-21 +PKG_VERSION:=2014-01-22 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:=2b32e9059166a23204fcf01e65a9184b3c39166b +PKG_SOURCE_VERSION:=cb6425ce059ddcd4ade45200fdcc39234ff500ad 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 a00f73de10..548f9632bf 100644 --- a/package/system/ubox/files/log.init +++ b/package/system/ubox/files/log.init @@ -21,29 +21,6 @@ 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))" @@ -89,8 +66,12 @@ 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 } |