diff --git a/bulkdata/Makefile b/bulkdata/Makefile index 7745b3bb0..8006bae1b 100755 --- a/bulkdata/Makefile +++ b/bulkdata/Makefile @@ -7,13 +7,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bulkdata -PKG_VERSION:=2.1.18 +PKG_VERSION:=2.1.19 LOCAL_DEV:=0 ifneq ($(LOCAL_DEV),1) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bulkdata.git -PKG_SOURCE_VERSION:=d38cb633fbca9e7391269c053a91d91db34730b7 +PKG_SOURCE_VERSION:=628525b02ae9ccd39f4bc85cf616ed4a102bca48 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MIRROR_HASH:=skip endif diff --git a/bulkdata/files/etc/config/bulkdata b/bulkdata/files/etc/config/bulkdata index 060d864fb..c300b554d 100644 --- a/bulkdata/files/etc/config/bulkdata +++ b/bulkdata/files/etc/config/bulkdata @@ -2,5 +2,5 @@ config bulkdata 'bulkdata' option enable '0' #Log levels: As per syslog 0-7, default 6=>LOG_INFO - option log_level '6' + option loglevel '3' diff --git a/bulkdata/files/etc/init.d/bulkdatad b/bulkdata/files/etc/init.d/bulkdatad index 3f99693bc..74907e668 100755 --- a/bulkdata/files/etc/init.d/bulkdatad +++ b/bulkdata/files/etc/init.d/bulkdatad @@ -6,9 +6,20 @@ STOP=10 USE_PROCD=1 PROG="/usr/sbin/bulkdatad" +validate_global_section() { + uci_validate_section bulkdata bulkdata bulkdata \ + 'enable:bool:1' \ + 'loglevel:uinteger:3' +} + start_service() { + local enable loglevel + + validate_global_section + procd_open_instance "bulkdata" procd_set_param command "$PROG" + procd_append_param command -l ${loglevel} procd_set_param respawn procd_close_instance "bulkdata" }