domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

procd: bump to latest HEAD

Browse Source 
2188d81 jail: add support for launching extroot containers
 6f3dbd2 jail: add support for userns and cgroupsns
 28a06e5 jail: add support for (ram-)overlayfs

Add handling for extroot, overlaydir and tmpoverlaysize as well as
jail flags for userns and cgroupsns to OpenWrt's shell script to
allow their use in init scripts.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle
2020-03-13 15:08:49 +01:00
parent 4a0f426ba5
commit 02a1914585
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
package/system/procd/Makefile
View File

@@ -12,9 +12,9 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git
PKG_SOURCE_DATE:=2020-03-13
PKG_SOURCE_VERSION:=77a6782d6e4eba2c49e642672de134aff443ef72
PKG_MIRROR_HASH:=bb7e98a6b6f997a4fa2fb924be248febe5a7633601df2e97e7a7513c57b63870
PKG_SOURCE_DATE:=2020-04-09
PKG_SOURCE_VERSION:=28a06e55cd4235faf52638dd85709e3da04c5c06
PKG_MIRROR_HASH:=f747393e2208888fdb15444d0fad354f46e47cccc393fd408e8cb1c51ef1dfc8
CMAKE_INSTALL:=1
PKG_LICENSE:=GPL-2.0

5
package/system/procd/files/procd.sh
View File

@@ -196,6 +196,8 @@ _procd_add_jail() {
ronly) json_add_boolean "ronly" "1";;
requirejail) json_add_boolean "requirejail" "1";;
netns) json_add_boolean "netns" "1";;
userns) json_add_boolean "userns" "1";;
cgroupsns) json_add_boolean "cgroupsns" "1";;
esac
done
json_add_object "mount"
@@ -258,7 +260,8 @@ _procd_set_param() {
reload_signal)
json_add_int "$type" $(kill -l "$1")
;;
pidfile|user|group|seccomp|capabilities|facility)
pidfile|user|group|seccomp|capabilities|facility|\
extroot|overlaydir|tmpoverlaysize)
json_add_string "$type" "$1"
;;
stdout|stderr|no_new_privs)