[openwrt/openwrt] procd: update to git HEAD

LEDE Commits lede-commits at lists.infradead.org
Thu Jul 15 10:23:33 PDT 2021


dangole pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/b1b16bddb0b45c65c25957da55463ba8c000a588

commit b1b16bddb0b45c65c25957da55463ba8c000a588
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Thu Jul 15 18:17:15 2021 +0100

    procd: update to git HEAD
    
     0ee73b2 uxc: implement support for rootfs overlay in containers
     b0a8ea1 jail: do not hack /etc/resolv.conf on container rootfs
     92aba53 jail: increase max additional env records to 64
     15997e6 jail: allow rootfs to be a symbolic link
     0114c6f jail: open() extroot folder before mounting
     ed96eda uxc: check for required blockd mounts
    
    Signed-off-by: Daniel Golle <daniel at makrotopia.org>
---
 package/system/procd/Makefile       | 8 ++++----
 package/system/procd/files/uxc.init | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile
index 36e7f11c29..b4ed79f08b 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-07-10
-PKG_SOURCE_VERSION:=2dcefbd6094681dcbd2d7ff608590e74425a9220
-PKG_MIRROR_HASH:=6f2615230a1db09740e8125517488a53b62baef0731b9adbd377765cad130289
+PKG_SOURCE_DATE:=2021-07-15
+PKG_SOURCE_VERSION:=ed96eda0a2a15c8ee801c4c26e8fe5bd241f83e9
+PKG_MIRROR_HASH:=34c5feda54cfa67d96a2d42a502817f7a4b0b9ad66f19333df9e212bdf842bda
 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
+  DEPENDS:=+procd-ujail +libubus +libubox +libblobmsg-json +blockd
   TITLE:=OpenWrt container management
   MAINTAINER:=Daniel Golle <daniel at makrotopia.org>
 endef
diff --git a/package/system/procd/files/uxc.init b/package/system/procd/files/uxc.init
index 035c8b0b9e..1e75b796f8 100644
--- a/package/system/procd/files/uxc.init
+++ b/package/system/procd/files/uxc.init
@@ -16,3 +16,7 @@ boot() {
 	__BOOT_UXC=1
 	start
 }
+
+service_triggers() {
+	procd_add_raw_trigger "mount.add" 3000 /etc/init.d/uxc boot
+}



More information about the lede-commits mailing list