diff options
| author |   Frantisek Sumsal <frantisek@sumsal.cz> | 2018-12-15 20:22:31 +0100 |
|---|---|---|
| committer |   Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-12-21 05:19:37 +0900 |
| commit | 67f5c0c776ce9449ad21e9854665573a05141fd4 (patch) | |
| tree | 06bd256d76da1cc069e1875a06ea6c84bf1681c9 | |
| parent | hwdb: Add accelerometer orientation quirk for the PoV TAB-P1006W-232-3G (diff) | |
| download | systemd-67f5c0c776ce9449ad21e9854665573a05141fd4.tar.gz systemd-67f5c0c776ce9449ad21e9854665573a05141fd4.tar.bz2 systemd-67f5c0c776ce9449ad21e9854665573a05141fd4.zip | |
tests: explicitly enable user namespaces for TEST-13-NSPAWN-SMOKE
| -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 75e214c00..774b7cbed 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 # mask some services that we do not want to run in these tests ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service @@ -70,6 +70,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 |