From af0d19fcdeb31777dd1cbbefe5177a5bab6466d6 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Thu, 26 Aug 2021 16:46:06 +0800 Subject: [PATCH] Revert "procd: update to git HEAD (#7676)" This reverts commit 0469fc1c980a0f6ed483b5255ad8824acf49cade. --- package/system/procd/Makefile | 8 ++++---- package/system/procd/files/procd.sh | 8 ++------ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index 98f1ed177..ccd0a9c75 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-15 -PKG_SOURCE_VERSION:=104b49d6ab25a8cf067e6d8d1f2da7defb9876d4 -PKG_MIRROR_HASH:=d13b566a14e84f6babe8b7d3dfb88e34c3dff0e97d7770d6fe71174685bca628 +PKG_SOURCE_DATE:=2021-08-13 +PKG_SOURCE_VERSION:=9f233f555f80d1c416656c04ab81d19edc738f07 +PKG_MIRROR_HASH:=01cdadba9e3a8848342f40383ff61cdc91516c9198790ca49dcc6837cdd83351 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 +rpcd + DEPENDS:=+procd-ujail +libubus +libubox +libblobmsg-json +blockd 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 bcae52a66..3be496fbb 100644 --- a/package/system/procd/files/procd.sh +++ b/package/system/procd/files/procd.sh @@ -385,15 +385,11 @@ procd_get_mountpoints() { } _procd_add_restart_mount_trigger() { - local mountpoints="$(procd_get_mountpoints "$@")" - [ "${mountpoints//[[:space:]]}" ] && - _procd_add_action_mount_trigger restart $mountpoints + _procd_add_action_mount_trigger restart $(procd_get_mountpoints "$@") } _procd_add_reload_mount_trigger() { - local mountpoints="$(procd_get_mountpoints "$@")" - [ "${mountpoints//[[:space:]]}" ] && - _procd_add_action_mount_trigger reload $mountpoints + _procd_add_action_mount_trigger reload $(procd_get_mountpoints "$@") } _procd_add_raw_trigger() {