From 0469fc1c980a0f6ed483b5255ad8824acf49cade Mon Sep 17 00:00:00 2001 From: Beginner <70857188+Beginner-Go@users.noreply.github.com> Date: Tue, 17 Aug 2021 18:46:22 +0800 Subject: [PATCH] procd: update to git HEAD (#7676) * procd: update to git HEAD 48638ad hotplug-dispatch: yet another rare memory leak disovered by Coverity 459b3e8 jail: fix several issues discovered by Coverity 2562e2b ujail-console: add missing error handling discovered by coverity Signed-off-by: Daniel Golle * procd: update to git HEAD 040fecc system: fix issues reported by Coverity 48f481b service: make sure string read is null terminated 16dbc2a uxc: fix a bunch of issues discovered by Coverity ff9002f uxc: fix help output 104b49d uxc: support config in uvol Signed-off-by: Daniel Golle * procd: add missing dependency and fix empty mount triggers procd.sh: Instead of triggering on every mount.add event, there should be no mount trigger at all in case none of the directories passed to procd_add_*_mount_trigger() are located on a mountpoint configured in /etc/config/fstab. uxc: add missing dependency on rpcd. Signed-off-by: Daniel Golle Co-authored-by: Daniel Golle --- package/system/procd/Makefile | 8 ++++---- package/system/procd/files/procd.sh | 8 ++++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index ccd0a9c75..98f1ed177 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git -PKG_SOURCE_DATE:=2021-08-13 -PKG_SOURCE_VERSION:=9f233f555f80d1c416656c04ab81d19edc738f07 -PKG_MIRROR_HASH:=01cdadba9e3a8848342f40383ff61cdc91516c9198790ca49dcc6837cdd83351 +PKG_SOURCE_DATE:=2021-08-15 +PKG_SOURCE_VERSION:=104b49d6ab25a8cf067e6d8d1f2da7defb9876d4 +PKG_MIRROR_HASH:=d13b566a14e84f6babe8b7d3dfb88e34c3dff0e97d7770d6fe71174685bca628 CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 @@ -90,7 +90,7 @@ endef define Package/uxc SECTION:=base CATEGORY:=Base system - DEPENDS:=+procd-ujail +libubus +libubox +libblobmsg-json +blockd + DEPENDS:=+procd-ujail +libubus +libubox +libblobmsg-json +blockd +rpcd TITLE:=OpenWrt container management MAINTAINER:=Daniel Golle endef diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh index 3be496fbb..bcae52a66 100644 --- a/package/system/procd/files/procd.sh +++ b/package/system/procd/files/procd.sh @@ -385,11 +385,15 @@ procd_get_mountpoints() { } _procd_add_restart_mount_trigger() { - _procd_add_action_mount_trigger restart $(procd_get_mountpoints "$@") + local mountpoints="$(procd_get_mountpoints "$@")" + [ "${mountpoints//[[:space:]]}" ] && + _procd_add_action_mount_trigger restart $mountpoints } _procd_add_reload_mount_trigger() { - _procd_add_action_mount_trigger reload $(procd_get_mountpoints "$@") + local mountpoints="$(procd_get_mountpoints "$@")" + [ "${mountpoints//[[:space:]]}" ] && + _procd_add_action_mount_trigger reload $mountpoints } _procd_add_raw_trigger() {