From: John Crispin <john@openwrt.org>
Date: Wed, 22 Jan 2014 15:33:16 +0000 (+0000)
Subject: ubox: revert log buffer size changes
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=922c9acc0efce287dc3a5a45b4fd31e75969e692;p=openwrt%2Fsvn-archive%2Farchive.git

ubox: revert log buffer size changes

the fix horribly broke existing setups

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

SVN-Revision: 39366
---

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
 }