[CRIU] [PATCH] zdtm: Run "ip link set up" after becoming userns root

[Pavel Emelyanov]

This allows excluding more userns tests from blacklist.

Signed-off-by: Pavel Emelyanov <xemul at parallels.com>
---
 test/zdtm/lib/ns.c | 4 ++--
 test/zdtm.sh       | 6 ------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/test/zdtm/lib/ns.c b/test/zdtm/lib/ns.c
index 8312455..4d2fd24 100644
--- a/test/zdtm/lib/ns.c
+++ b/test/zdtm/lib/ns.c
@@ -192,8 +192,6 @@ int ns_exec(void *_arg)
 
 	setsid();
 
-	system("ip link set up dev lo");
-
 	ret = dup2(args->status_pipe[1], STATUS_FD);
 	if (ret < 0) {
 		fprintf(stderr, "dup2() failed: %m\n");
@@ -207,6 +205,8 @@ int ns_exec(void *_arg)
 		return -1;
 	}
 
+	system("ip link set up dev lo");
+
 	if (prepare_mntns())
 		return -1;
 
diff --git a/test/zdtm.sh b/test/zdtm.sh
index bcbb2d1..2d0e8e8 100755
--- a/test/zdtm.sh
+++ b/test/zdtm.sh
@@ -251,13 +251,7 @@ generate_test_list()
 		ns/static/mlock_setuid
 		ns/static/sched_prio00
 		ns/static/sched_policy00
-		ns/static/socket_listen
-		ns/static/socket_listen6
-		ns/static/packet_sock
 		ns/static/packet_sock_mmap
-		ns/static/socket_udp
-		ns/static/socket6_udp
-		ns/static/socket_udplite
 		ns/static/fanotify00
 		ns/static/fifo-ghost
 		ns/static/unlink_fifo
-- 
1.8.4.2