diff options
author | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2020-01-30 18:32:00 +0000 |
---|---|---|
committer | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2020-02-04 21:51:11 +0000 |
commit | c0c988e179a75d33c82ed0621d954fc0ac2c0c14 (patch) | |
tree | a718fedd535cddef2e15fb22b3dae314a5839604 /package | |
parent | 96424c143dd818b391d9b8da18249eca1d2e6c83 (diff) | |
download | upstream-c0c988e179a75d33c82ed0621d954fc0ac2c0c14.tar.gz upstream-c0c988e179a75d33c82ed0621d954fc0ac2c0c14.tar.bz2 upstream-c0c988e179a75d33c82ed0621d954fc0ac2c0c14.zip |
procd: support 'requirejail' attribute
Bump procd package to reduce log spam related to missing jail binaries
in a non-jail capable system.
bcb8655 instance: add 'requirejail' attribute
An additional jail attribute 'requirejail' can now be used to indicate
mandatory use of a jailed environment and hence prevent process startup
in the event that the jail subsystem is unavailable.
Procd will now only log errors if jail is unavailable and 1) is a mandatory
requirement or 2) a procd debug level of at least 2 is in use.
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Diffstat (limited to 'package')
-rw-r--r-- | package/system/procd/Makefile | 4 | ||||
-rw-r--r-- | package/system/procd/files/procd.sh | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index 978da29dd0..de2b94b1d9 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-01-24 +PKG_SOURCE_DATE:=2020-02-04 PKG_SOURCE_VERSION:=00aafc4f439ec3ace834c1a803b899bd1ceba9db -PKG_MIRROR_HASH:=0d5abe409f8dd5979fa753c2f9999c0434a4b465079fcdd861494814992f1980 +PKG_MIRROR_HASH:=a435449aed225a0394455d627b1ac5ca8bcf27d38238869bad5220a672012688 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 b8f9a210f6..e8b1b6ffb7 100644 --- a/package/system/procd/files/procd.sh +++ b/package/system/procd/files/procd.sh @@ -194,6 +194,7 @@ _procd_add_jail() { procfs) json_add_boolean "procfs" "1";; sysfs) json_add_boolean "sysfs" "1";; ronly) json_add_boolean "ronly" "1";; + requirejail) json_add_boolean "requirejail" "1";; esac done json_add_object "mount" |