Change cgroup node from NSJAIL to malort

As default, NSJAIL uses "NSJAIL" folder to create nsjail controller cgroup.
However, ST-hub uses the folder as "malort" which is internal project name.

At this moment, to reduce not-hurried code clean-up tasks, change nsjail root folder as "malort"

diff --git a/packaging/nsjail.sh b/packaging/nsjail.sh
index d38d4410fdf2403209b4dd7cf18c95b9af19410f..972d73b09c7513cefa25f7317a90928cff0e576c 100644 (file)
--- a/packaging/nsjail.sh
+++ b/packaging/nsjail.sh
@@ -5,11 +5,11 @@ OWNER_ID=`id -u owner`
 
 if [ x$1 == "xstart" ]
 then
-       mkdir /sys/fs/cgroup/memory/NSJAIL
-       chown -R owner:users /sys/fs/cgroup/memory/NSJAIL
+       mkdir /sys/fs/cgroup/memory/malort
+       chown -R owner:users /sys/fs/cgroup/memory/malort
 
-       mkdir /sys/fs/cgroup/cpu/NSJAIL
-       chown -R owner:users /sys/fs/cgroup/cpu/NSJAIL
+       mkdir /sys/fs/cgroup/cpu/malort
+       chown -R owner:users /sys/fs/cgroup/cpu/malort
 
        while [ ! -d /run/user/${OWNER_ID} ]; do sleep 1; done
 
@@ -17,11 +17,11 @@ then
        chown owner:users /run/user/${OWNER_ID}/nsjail
        chsmack -a "*" /run/user/${OWNER_ID}/nsjail
 else
-       rmdir /sys/fs/cgroup/memory/NSJAIL/NSJAIL*
-       rmdir /sys/fs/cgroup/memory/NSJAIL
+       rmdir /sys/fs/cgroup/memory/malort/NSJAIL*
+       rmdir /sys/fs/cgroup/memory/malort
 
-       rmdir /sys/fs/cgroup/cpu/NSJAIL/NSJAIL*
-       rmdir /sys/fs/cgroup/cpu/NSJAIL
+       rmdir /sys/fs/cgroup/cpu/malort/NSJAIL*
+       rmdir /sys/fs/cgroup/cpu/malort
 
        rm -rf /run/user/${OWNER_ID}/nsjail
 fi

diff --git a/test/runner-sandbox.cfg b/test/runner-sandbox.cfg
index c39748ade3658fc2cde6b86113a49d4767797e3f..f5767afcabebdada4dfc209a4d16925f6b232cf7 100644 (file)
--- a/test/runner-sandbox.cfg
+++ b/test/runner-sandbox.cfg
@@ -60,12 +60,11 @@ clone_newipc: true
 clone_newuts: true
 clone_newcgroup: true
 
+log_file: "/tmp/nsjail.log"
+
 cgroup_mem_max: 10000000
 cgroup_cpu_ms_per_sec: 100
 
-log_file: "/tmp/nsjail.log"
-pass_fd: 10
-
 ## Mount settings
 mount_proc: false