diff options
author | Frantisek Sumsal <frantisek@sumsal.cz> | 2018-12-15 20:22:31 +0100 |
---|---|---|
committer | Lukáš Nykrýn <lnykryn@redhat.com> | 2019-01-14 13:03:33 +0100 |
commit | e8ead61e1c0a919a97df64b14dbd572ef7c830d2 (patch) | |
tree | 74f355a4e3553c183a379b9af21d9e2d44aae391 | |
parent | 75c9af80cf3529c76988451e63f98010c86f48f1 (diff) | |
download | systemd-e8ead61e1c0a919a97df64b14dbd572ef7c830d2.tar.gz |
tests: explicitly enable user namespaces for TEST-13-NSPAWN-SMOKE
Cherry-picked from: 67f5c0c776ce9449ad21e9854665573a05141fd4
-rwxr-xr-x | test/TEST-13-NSPAWN-SMOKE/test.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/test/TEST-13-NSPAWN-SMOKE/test.sh b/test/TEST-13-NSPAWN-SMOKE/test.sh index 6a0cb42eaf..c0789b5d20 100755 --- a/test/TEST-13-NSPAWN-SMOKE/test.sh +++ b/test/TEST-13-NSPAWN-SMOKE/test.sh @@ -18,7 +18,7 @@ test_setup() { eval $(udevadm info --export --query=env --name=${LOOPDEV}p2) setup_basic_environment - dracut_install busybox chmod rmdir unshare ip + dracut_install busybox chmod rmdir unshare ip sysctl cp create-busybox-container $initdir/ @@ -63,6 +63,11 @@ if [[ -f /proc/1/ns/cgroup ]]; then fi is_user_ns_supported=no +# On some systems (e.g. CentOS 7) the default limit for user namespaces +# is set to 0, which causes the following unshare syscall to fail, even +# with enabled user namespaces support. By setting this value explicitly +# we can ensure the user namespaces support to be detected correctly. +sysctl -w user.max_user_namespaces=10000 if unshare -U sh -c :; then is_user_ns_supported=yes fi |