diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2020-03-13 15:08:49 +0100 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2020-04-09 13:07:22 +0100 |
| commit | 02a1914585fffb97b26cc871b303a39ac9d37cbb (patch) | |
| tree | a3a47a115e6b0946d5d3439a635ac16a545f3654 /package/system/procd | |
| parent | 4a0f426ba5044af2fe45be8cc553f1580484883c (diff) | |
| download | upstream-02a1914585fffb97b26cc871b303a39ac9d37cbb.tar.gz upstream-02a1914585fffb97b26cc871b303a39ac9d37cbb.tar.bz2 upstream-02a1914585fffb97b26cc871b303a39ac9d37cbb.zip | |
procd: bump to latest HEAD
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>
Diffstat (limited to 'package/system/procd')
| -rw-r--r-- | package/system/procd/Makefile | 6 | ||||
| -rw-r--r-- | package/system/procd/files/procd.sh | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index 7516089352..742a77e875 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -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 diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh index 7031763844..25a9f049cb 100644 --- a/package/system/procd/files/procd.sh +++ b/package/system/procd/files/procd.sh @@ -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) |