bbjubjub2494/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #2211 from unsatcore/master

Browse source 
tests: more robust check for user namespaces availability (canUseSand…
This commit is contained in:
Eelco Dolstra 2018-06-11 11:10:02 +02:00 committed by GitHub
parent 9c2283cc4a a717ad7484
commit de71335e4d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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.optionals stdenv.isLinux [libseccomp 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 {

4
tests/common.sh.in
View file

@ -94,12 +94,10 @@ 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
} }