diff --git a/obuspa/Makefile b/obuspa/Makefile index 60dbd667e..e8bc7e773 100644 --- a/obuspa/Makefile +++ b/obuspa/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=obuspa -PKG_VERSION:=3.0.0.0 +PKG_VERSION:=3.0.0.1 LOCAL_DEV:=0 ifneq ($(LOCAL_DEV),1) PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=8e8cfcbd3b651bd39cb93398042af0df3155486c +PKG_SOURCE_VERSION:=24779ef2696ac1d431abfd78cdb15578525b24b3 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/obuspa.git PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz endif diff --git a/obuspa/files/etc/config/obuspa b/obuspa/files/etc/config/obuspa index 9c06c0201..787e15311 100644 --- a/obuspa/files/etc/config/obuspa +++ b/obuspa/files/etc/config/obuspa @@ -6,7 +6,7 @@ config obuspa 'global' option ifname 'br-lan' option debug 'false' option log_level '1' - option db_file '/tmp/usp.db' + #option db_file '/tmp/usp.db' #option log_dest '/var/log/obuspa' # Configures Device.LocalAgent and Controller boot prameters diff --git a/obuspa/files/etc/init.d/obuspa b/obuspa/files/etc/init.d/obuspa index 32d28a951..e77fe822b 100755 --- a/obuspa/files/etc/init.d/obuspa +++ b/obuspa/files/etc/init.d/obuspa @@ -29,12 +29,12 @@ validate_obuspa_section() { uci_validate_section ${CONFIGURATION} obuspa "${1}" \ 'enabled:bool:true' \ - 'cert:string:"/etc/obuspa/rootCA.pem"' \ + 'cert:string:/etc/obuspa/rootCA.pem' \ 'ifname:string:"br-lan"' \ 'debug:bool:false' \ 'log_level:uinteger:2' \ - 'log_dest:string:stdout' \ - 'db_file:string:"/tmp/usp.db"' + 'log_dest:string' \ + 'db_file:string' } validate_localagent_section() @@ -364,14 +364,18 @@ configure_obuspa() { grep -q "export USP_BOARD_IFNAME=${ifname}" /root/.profile || \ echo "export USP_BOARD_IFNAME=${ifname}" >> /root/.profile - echo "${db_file}" >>${KEEP_FILES} if [ -n "${db_file}" ]; then - procd_append_param command -f ${db_file} + echo "${db_file}" >>${KEEP_FILES} + if [ -f "${db_file}" ]; then + procd_append_param command -f ${db_file} + fi fi - if [ -e "${cert}" ]; then - procd_append_param command -t ${cert} + if [ -n "${cert}" ]; then echo "${cert}" >>${KEEP_FILES} + if [ -f "${cert}" ]; then + procd_append_param command -t ${cert} + fi fi procd_set_param env USP_BOARD_IFNAME=${ifname}