From: John Crispin <john@openwrt.org>
Date: Fri, 11 Dec 2015 15:08:19 +0000 (+0000)
Subject: procd: update procd.sh to support new ujail options
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=32b37600b921608e5d534b971dd62732ffc6325e;p=openwrt%2Fstaging%2Fnbd.git

procd: update procd.sh to support new ujail options

Signed-off-by: Etienne CHAMPETIER <champetier.etienne@gmail.com>

SVN-Revision: 47862
---

diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh
index e83e75cb34..a2a63f8cd5 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