daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
36e8a3
From e8ead61e1c0a919a97df64b14dbd572ef7c830d2 Mon Sep 17 00:00:00 2001
36e8a3
From: Frantisek Sumsal <frantisek@sumsal.cz>
36e8a3
Date: Sat, 15 Dec 2018 20:22:31 +0100
36e8a3
Subject: [PATCH] tests: explicitly enable user namespaces for
36e8a3
 TEST-13-NSPAWN-SMOKE
36e8a3
36e8a3
Cherry-picked from: 67f5c0c776ce9449ad21e9854665573a05141fd4
36e8a3
---
36e8a3
 test/TEST-13-NSPAWN-SMOKE/test.sh | 7 ++++++-
36e8a3
 1 file changed, 6 insertions(+), 1 deletion(-)
36e8a3
36e8a3
diff --git a/test/TEST-13-NSPAWN-SMOKE/test.sh b/test/TEST-13-NSPAWN-SMOKE/test.sh
4bff0a
index 6a0cb42eaf..c0789b5d20 100755
36e8a3
--- a/test/TEST-13-NSPAWN-SMOKE/test.sh
36e8a3
+++ b/test/TEST-13-NSPAWN-SMOKE/test.sh
36e8a3
@@ -18,7 +18,7 @@ test_setup() {
36e8a3
         eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
36e8a3
 
36e8a3
         setup_basic_environment
36e8a3
-        dracut_install busybox chmod rmdir unshare ip
36e8a3
+        dracut_install busybox chmod rmdir unshare ip sysctl
36e8a3
 
36e8a3
         cp create-busybox-container $initdir/
36e8a3
 
36e8a3
@@ -63,6 +63,11 @@ if [[ -f /proc/1/ns/cgroup ]]; then
36e8a3
 fi
36e8a3
 
36e8a3
 is_user_ns_supported=no
36e8a3
+# On some systems (e.g. CentOS 7) the default limit for user namespaces
36e8a3
+# is set to 0, which causes the following unshare syscall to fail, even
36e8a3
+# with enabled user namespaces support. By setting this value explicitly
36e8a3
+# we can ensure the user namespaces support to be detected correctly.
36e8a3
+sysctl -w user.max_user_namespaces=10000
36e8a3
 if unshare -U sh -c :; then
36e8a3
     is_user_ns_supported=yes
36e8a3
 fi