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 <daniel@makrotopia.org>

diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile
index e55d7755ebfb52e6a10641ff80796855f7863e7c..98f1ed1775fb20e721ac977ac8635d0d908ed24e 100644 (file)
--- a/package/system/procd/Makefile
+++ b/package/system/procd/Makefile
@@ -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 <daniel@makrotopia.org>
 endef

diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh
index 14314bec95587c9e76a368bb7cf0a24107e19a04..3549a5a914b96034fc3a0034a21d8e5086be2e67 100644 (file)
--- a/package/system/procd/files/procd.sh
+++ b/package/system/procd/files/procd.sh
@@ -394,11 +394,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() {