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

systemd-confinement: handle ExecStarts etc being lists #97303

Merged
merged 1 commit into from Sep 10, 2020
Merged

systemd-confinement: handle ExecStarts etc being lists #97303

merged 1 commit into from Sep 10, 2020

Conversation

martinetd
Copy link
Member

systemd-confinement's automatic package extraction does not work correctly
if ExecStarts ExecReload etc are lists.

Add an extra flatten to make things smooth.

Fixes #96840.
(will need backporting to 20.03 to properly fix it actually)

Motivation for this change

#96840 describes the problem but basically recent nginx update broke confinement for it due to this bug in confinement handling.

Things done
  • 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 nixpkgs-review --run "nixpkgs-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.

@martinetd
systemd-confinement: handle ExecStarts etc being lists
fd19645 
systemd-confinement's automatic package extraction does not work correctly
if ExecStarts ExecReload etc are lists.

Add an extra flatten to make things smooth.

Fixes NixOS#96840.
@martinetd
Copy link
Member Author

Had forgotten mentions: cc @aszlig @flokli @ju1m

Thanks!

@flokli flokli merged commit 303078d into NixOS:master Sep 10, 2020
@flokli
Copy link
Contributor

flokli commented Sep 10, 2020

Backported to 20.09 in c3dea4d, to 20.03 in e6bc03b.

@flokli
Copy link
Contributor

flokli commented Sep 10, 2020

Thanks for the fix!

@martinetd
Copy link
Member Author

Thanks for merging and backports! :)

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 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

nginx + systemd confinement broken recently
2 participants
@martinetd @flokli