lix-project/lix
20
57
Fork 31
Code Issues 349 Code Review (Gerrit) Projects 3 Releases Wiki Activity

tests: more robust check for user namespaces availability (canUseSandbox)

Browse source 
Issue https://github.com/NixOS/nix/issues/2165
This commit is contained in:
Aleksandr Pashkov 2018-06-05 23:13:51 +03:00
parent 4ac4f675df
commit 5ee4472b8b
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
release-common.nix
View file

@ -57,7 +57,7 @@ rec {
git git
mercurial mercurial
] ]
++ lib.optional stdenv.isLinux libseccomp ++ lib.optional stdenv.isLinux [libseccomp pkgs.utillinux]
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) ++ lib.optional (stdenv.isLinux || stdenv.isDarwin)
(aws-sdk-cpp.override { (aws-sdk-cpp.override {

8
tests/common.sh.in
View file

@ -94,11 +94,9 @@ canUseSandbox() {
return 1 return 1
fi fi
if [ -e /proc/sys/kernel/unprivileged_userns_clone ]; then if ! unshare --user true ; then
if [ "$(cat /proc/sys/kernel/unprivileged_userns_clone)" != 1 ]; then echo "Unprivileged user namespaces disabled by sysctl, skipping this test..."
echo "Unprivileged user namespaces disabled by sysctl, skipping this test..." return 1
return 1
fi
fi fi
return 0 return 0