tests: more robust check for user namespaces availability (canUseSand… #2211
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dezgeg
reviewed
Jun 5, 2018
| @@ -94,11 +94,9 @@ canUseSandbox() { | |||
| return 1 | |||
There was a problem hiding this comment.
I think you can get rid of this test up here as well.
dezgeg
reviewed
Jun 5, 2018
release-common.nix
Outdated
| @@ -57,7 +57,7 @@ rec { | |||
| git | |||
| mercurial | |||
| ] | |||
| ++ lib.optional stdenv.isLinux libseccomp | |||
| ++ lib.optional stdenv.isLinux [libseccomp pkgs.utillinux] | |||
There was a problem hiding this comment.
Drop the pkgs. given that other places don't use it either (and there's a with pkgs; up top).
|
busybox seems to provide a copy of "unshare", FWIW. Not sure if adequate (and not sure how well things work if you try adding it as a build input re:introducing busybox versions of all-the-things) but thought I'd mention :). |
veprbl
reviewed
Jun 8, 2018
release-common.nix
Outdated
| @@ -57,7 +57,7 @@ rec { | |||
| git | |||
| mercurial | |||
| ] | |||
| ++ lib.optional stdenv.isLinux [libseccomp pkgs.utillinux] | |||
| ++ lib.optional stdenv.isLinux [libseccomp utillinux] | |||
There was a problem hiding this comment.
Also should use lib.optionals (notice the "s") to avoid placing a nested list
https://github.com/NixOS/nixpkgs/blob/master/lib/lists.nix#L200-L222
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…box)
Fixes #2165
unshare-utility way as suggested by @veprblTwo things to pay attention to