[OpenWrt-Devel] [PATCH 1/2] procd: update procd.sh to support new ujail options

Etienne CHAMPETIER champetier.etienne at gmail.com
Mon Nov 30 18:13:40 EST 2015


Signed-off-by: Etienne CHAMPETIER <champetier.etienne at gmail.com>
---
 package/system/procd/files/procd.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh
index e83e75c..a2a63f8 100644
--- a/package/system/procd/files/procd.sh
+++ b/package/system/procd/files/procd.sh
@@ -126,7 +126,6 @@ _procd_open_validate() {
 _procd_add_jail() {
 	json_add_object "jail"
 	json_add_string name "$1"
-	json_add_string root "/tmp/.jail/$1"
 
 	shift
 	
@@ -136,6 +135,7 @@ _procd_add_jail() {
 		ubus)	json_add_boolean "ubus" "1";;
 		procfs)	json_add_boolean "procfs" "1";;
 		sysfs)	json_add_boolean "sysfs" "1";;
+		ronly)	json_add_boolean "ronly" "1";;
 		esac
 	done
 	json_add_object "mount"
@@ -195,10 +195,10 @@ _procd_set_param() {
 		nice)
 			json_add_int "$type" "$1"
 		;;
-		user|seccomp)
+		user|seccomp|capabilities)
 			json_add_string "$type" "$1"
 		;;
-		stdout|stderr)
+		stdout|stderr|no_new_privs)
 			json_add_boolean "$type" "$1"
 		;;
 	esac
-- 
1.9.1
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel



More information about the openwrt-devel mailing list