ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-19 13:48:06 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

procd: support 'requirejail' attribute

Browse Source 
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>
This commit is contained in:
Kevin Darbyshire-Bryant 2020-01-30 18:32:00 +00:00
parent 96424c143d
commit c0c988e179
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/system/procd/Makefile
View File

@ -12,9 +12,9 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.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_SOURCE_VERSION:=00aafc4f439ec3ace834c1a803b899bd1ceba9db
PKG_MIRROR_HASH:=0d5abe409f8dd5979fa753c2f9999c0434a4b465079fcdd861494814992f1980 PKG_MIRROR_HASH:=a435449aed225a0394455d627b1ac5ca8bcf27d38238869bad5220a672012688
CMAKE_INSTALL:=1 CMAKE_INSTALL:=1
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0

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

@ -194,6 +194,7 @@ _procd_add_jail() {
procfs) json_add_boolean "procfs" "1";; procfs) json_add_boolean "procfs" "1";;
sysfs) json_add_boolean "sysfs" "1";; sysfs) json_add_boolean "sysfs" "1";;
ronly) json_add_boolean "ronly" "1";; ronly) json_add_boolean "ronly" "1";;
requirejail) json_add_boolean "requirejail" "1";;
esac esac
done done
json_add_object "mount" json_add_object "mount"