[CRIU] [PATCH] test: create /etc in a temporary root

Andrey Vagin avagin at openvz.org
Tue Mar 24 22:16:54 PDT 2015


inotify_irmap creates files in /etc so it should be able to do
this from userns.

Signed-off-by: Andrey Vagin <avagin at openvz.org>
---
 test/zdtm.sh                          | 4 ++++
 test/zdtm/live/static/inotify_irmap.c | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/zdtm.sh b/test/zdtm.sh
index 577e456..44f1884 100755
--- a/test/zdtm.sh
+++ b/test/zdtm.sh
@@ -417,6 +417,10 @@ construct_root()
 	local tmpdir=$root/tmp
 	local lname tname
 
+	# inotify_irmap creates files in /etc so it should be able to do
+	# this from userns.
+	mkdir -m 0777 -p $root/etc
+
 	mkdir -p $root/bin
 	cp $ps_path $root/bin
 
diff --git a/test/zdtm/live/static/inotify_irmap.c b/test/zdtm/live/static/inotify_irmap.c
index 28c619c..011fb81 100644
--- a/test/zdtm/live/static/inotify_irmap.c
+++ b/test/zdtm/live/static/inotify_irmap.c
@@ -30,7 +30,6 @@ int main (int argc, char *argv[])
 
 	test_init(argc, argv);
 
-	mkdir(TDIR, 0600);
 	unlink(TFIL);
 	if (creat(TFIL, 0600) < 0) {
 		err("Can't make test file");
-- 
2.1.0



More information about the CRIU mailing list