aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2015-12-11 15:08:19 +0000
committerJohn Crispin <blogic@openwrt.org>2015-12-11 15:08:19 +0000
commit257b5055dc80dabbbe91cd890a093fa6535e21f3 (patch)
treec2b0317f07d9304f9ea4f8e7cd7c38d15ce4ebbf
parent4b57ed6d7eab2889f38796c41e36b2275030dc2b (diff)
downloadmaster-187ad058-257b5055dc80dabbbe91cd890a093fa6535e21f3.tar.gz
master-187ad058-257b5055dc80dabbbe91cd890a093fa6535e21f3.tar.bz2
master-187ad058-257b5055dc80dabbbe91cd890a093fa6535e21f3.zip
procd: update procd.sh to support new ujail options
Signed-off-by: Etienne CHAMPETIER <champetier.etienne@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47862 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/system/procd/files/procd.sh6
1 files changed, 3 insertions, 3 deletions
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