From 805a442ab345ae9b4bedb65b8d9f3a939668c9e7 Mon Sep 17 00:00:00 2001
From: Kunhoon Baik <knhoon.baik@samsung.com>
Date: Wed, 21 Jul 2021 09:27:33 +0900
Subject: [PATCH] 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"
---
 packaging/nsjail.sh     | 16 ++++++++--------
 test/runner-sandbox.cfg |  5 ++---
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/packaging/nsjail.sh b/packaging/nsjail.sh
index d38d441..972d73b 100644
--- 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 c39748a..f5767af 100644
--- 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
 
-- 
2.34.1