diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-01-08 06:01:06 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-08 06:01:06 +0000 |
commit | b60b0a223e7335cd99c5e9b1873c68e97711ca17 (patch) | |
tree | ba3183661d2637aa8598d156b91ddbdd2f618c2e /nixos/modules/virtualisation/cri-o.nix | |
parent | 4bf238a8fbdad042a3912cc1638cca9fd671ddb2 (diff) | |
parent | 46ee37ca1d9cd3bb18633b4104ef21d9035aac89 (diff) | |
download | nixpkgs-b60b0a223e7335cd99c5e9b1873c68e97711ca17.tar nixpkgs-b60b0a223e7335cd99c5e9b1873c68e97711ca17.tar.gz nixpkgs-b60b0a223e7335cd99c5e9b1873c68e97711ca17.tar.bz2 nixpkgs-b60b0a223e7335cd99c5e9b1873c68e97711ca17.tar.lz nixpkgs-b60b0a223e7335cd99c5e9b1873c68e97711ca17.tar.xz nixpkgs-b60b0a223e7335cd99c5e9b1873c68e97711ca17.tar.zst nixpkgs-b60b0a223e7335cd99c5e9b1873c68e97711ca17.zip |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/virtualisation/cri-o.nix')
-rw-r--r-- | nixos/modules/virtualisation/cri-o.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index 95ce1fea58b..3503a6fff6a 100644 --- a/nixos/modules/virtualisation/cri-o.nix +++ b/nixos/modules/virtualisation/cri-o.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, utils, ... }: +{ config, lib, pkgs, ... }: with lib; let @@ -93,7 +93,7 @@ in config = mkIf cfg.enable { environment.systemPackages = [ cfg.package pkgs.cri-tools ]; - environment.etc."crictl.yaml".source = utils.copyFile "${pkgs.cri-o-unwrapped.src}/crictl.yaml"; + environment.etc."crictl.yaml".source = "${cfg.package}/etc/crictl.yaml"; virtualisation.cri-o.settings.crio = { storage_driver = cfg.storageDriver; @@ -124,8 +124,8 @@ in }; }; - environment.etc."cni/net.d/10-crio-bridge.conf".source = utils.copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/10-crio-bridge.conf"; - environment.etc."cni/net.d/99-loopback.conf".source = utils.copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/99-loopback.conf"; + environment.etc."cni/net.d/10-crio-bridge.conflist".source = "${cfg.package}/etc/cni/net.d/10-crio-bridge.conflist"; + environment.etc."cni/net.d/99-loopback.conflist".source = "${cfg.package}/etc/cni/net.d/99-loopback.conflist"; environment.etc."crio/crio.conf.d/00-default.conf".source = cfgFile; # Enable common /etc/containers configuration |