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.

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

cri-o: add pinns path and witch to crio.conf.d config style #95576

Merged
merged 1 commit into from Aug 21, 2020
Merged

cri-o: add pinns path and witch to crio.conf.d config style #95576

merged 1 commit into from Aug 21, 2020

Conversation

saschagrunert
Copy link
Member

@saschagrunert saschagrunert commented Aug 16, 2020 •
edited

Motivation for this change

This adds the pinns path to the configuration let CRI-O start properly.
We also change the configuration to the new drop-in syntax.

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.

cc @NixOS/podman

@saschagrunert
cri-o: add pinns path and witch to crio.conf.d config style
dc6b8ce 
This adds the pinns path to the configuration let CRI-O start properly.
We also change the configuration to the new drop-in syntax.

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
@zowoq zowoq merged commit 71dd85b into NixOS:master Aug 21, 2020
@saschagrunert saschagrunert deleted the cri-o branch August 21, 2020 07:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zowoq zowoq zowoq approved these changes

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.

None yet
2 participants
@saschagrunert @zowoq