Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nixos/containers: fix handling of cfg.additionalCapabilities #72996

Merged
merged 1 commit into from
Nov 25, 2019
Merged

nixos/containers: fix handling of cfg.additionalCapabilities #72996

merged 1 commit into from
Nov 25, 2019

Conversation

elohmeier
Copy link
Contributor

Motivation for this change

There is a bug in how the systemd-nspawn --capabilities argument is generated. Commas should be used instead of whitespaces, see https://www.freedesktop.org/software/systemd/man/systemd-nspawn.html#--capability=.

Things done

This PR fixes the module to generate the correct argument.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Nov 7, 2019
@veprbl veprbl added the 6.topic: nixos-container Imperative and declarative systemd-nspawn containers label Nov 7, 2019
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Nov 7, 2019
@adisbladis adisbladis merged commit 4d78ab0 into NixOS:master Nov 25, 2019
@flokli
Copy link
Contributor

flokli commented Nov 25, 2019

@elohmeier could you extend one of the nixos/tests/containers-* test to exercise additionalCapabilities and check for it, so we can assure this doesn't break in the future?

@adisbladis
Copy link
Member

Backported to 19.09 in 2d88347.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: nixos-container Imperative and declarative systemd-nspawn containers 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@elohmeier @flokli @adisbladis @veprbl