diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 226dd26502..45e725c18f 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/version.mk include $(INCLUDE_DIR)/feeds.mk PKG_NAME:=base-files -PKG_RELEASE:=197 +PKG_RELEASE:=198 PKG_FLAGS:=nonshared PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile index cc2dc2bd47..85b7be7607 100644 --- a/package/network/services/uhttpd/Makefile +++ b/package/network/services/uhttpd/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uhttpd -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/uhttpd.git diff --git a/package/system/fstools/files/fstab.init b/package/system/fstools/files/fstab.init index 08d5601bee..516e946191 100755 --- a/package/system/fstools/files/fstab.init +++ b/package/system/fstools/files/fstab.init @@ -8,11 +8,12 @@ boot() { } start() { - return 0 + /sbin/block mount } restart() { - return 0 + /sbin/block umount + /sbin/block mount } stop() { diff --git a/package/system/ubox/Makefile b/package/system/ubox/Makefile index 98d55f2844..6e67951929 100644 --- a/package/system/ubox/Makefile +++ b/package/system/ubox/Makefile @@ -1,13 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ubox -PKG_RELEASE:=1 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubox.git -PKG_SOURCE_DATE:=2018-12-18 -PKG_SOURCE_VERSION:=876c7f5bfb9b13d48e6d7960dd114082a0a95a6d -PKG_MIRROR_HASH:=7c51ede116f7b17d8249453b10023398a4b662e78294c6fc269c8ed375cb47ce +PKG_SOURCE_DATE:=2019-06-16 +PKG_SOURCE_VERSION:=4df34a4d0d5183135217fc8280faae8e697147bc +PKG_MIRROR_HASH:=a4064a1aa29cf612735b0da180f5bdee62304e907f57730482cad97b04f2b189 CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 @@ -27,18 +27,28 @@ define Package/ubox TITLE:=OpenWrt system helper toolbox endef +define Package/getrandom + SECTION:=base + CATEGORY:=Base system + TITLE:=OpenWrt getrandom system helper +endef + define Package/logd -SECTION:=base + SECTION:=base CATEGORY:=Base system DEPENDS:=+libubox +libubus +libblobmsg-json +USE_GLIBC:librt TITLE:=OpenWrt system log implementation endef +define Package/getrandom/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/getrandom $(1)/usr/bin/ +endef + define Package/ubox/install $(INSTALL_DIR) $(1)/sbin $(1)/usr/sbin $(1)/lib $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{kmodloader,validate_data} $(1)/sbin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/getrandom $(1)/usr/bin/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libvalidate.so $(1)/lib $(LN) kmodloader $(1)/sbin/rmmod @@ -56,4 +66,5 @@ define Package/logd/install endef $(eval $(call BuildPackage,ubox)) +$(eval $(call BuildPackage,getrandom)) $(eval $(call BuildPackage,logd)) diff --git a/package/system/ubox/files/log.init b/package/system/ubox/files/log.init index ae5dd1f03d..ba9c124c8b 100755 --- a/package/system/ubox/files/log.init +++ b/package/system/ubox/files/log.init @@ -11,7 +11,7 @@ PROG=/sbin/logread validate_log_section() { - uci_validate_section system system "${1}" \ + uci_load_validate system system "$1" "$2" \ 'log_file:string' \ 'log_size:uinteger' \ 'log_hostname:string' \ @@ -25,15 +25,13 @@ validate_log_section() validate_log_daemon() { - uci_validate_section system system "${1}" \ + uci_load_validate system system "$1" "$2" \ 'log_size:uinteger:0' \ 'log_buffer_size:uinteger:0' } start_service_daemon() { - local log_buffer_size log_size - validate_log_daemon "${1}" [ $log_buffer_size -eq 0 -a $log_size -gt 0 ] && log_buffer_size=$log_size [ $log_buffer_size -eq 0 ] && log_buffer_size=64 procd_open_instance @@ -47,9 +45,8 @@ start_service_file() { PIDCOUNT="$(( ${PIDCOUNT} + 1))" local pid_file="/var/run/logread.${PIDCOUNT}.pid" - local log_file log_size - validate_log_section "${1}" || { + [ "$2" = 0 ] || { echo "validation failed" return 1 } @@ -67,9 +64,8 @@ start_service_remote() { PIDCOUNT="$(( ${PIDCOUNT} + 1))" local pid_file="/var/run/logread.${PIDCOUNT}.pid" - local log_ip log_port log_proto log_prefix log_remote log_trailer_null log_hostname - validate_log_section "${1}" || { + [ "$2" = 0 ] || { echo "validation failed" return 1 } @@ -96,7 +92,11 @@ service_triggers() start_service() { config_load system - config_foreach start_service_daemon system - config_foreach start_service_file system - config_foreach start_service_remote system + config_foreach validate_log_daemon system start_service_daemon + config_foreach validate_log_section system start_service_file + config_foreach validate_log_section system start_service_remote +} + +service_running() { + procd_running log }