diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2023-01-01 12:14:11 +1000 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2023-01-08 13:30:27 +1000 |
| commit | 448dc91db4f17b5e6e1f5c247eb8a847d1378f56 (patch) | |
| tree | 4c5ac37fc689010fd0f9fc97b94ac18e01d2aed0 | |
| parent | 5da87a8c7bba28d80312e061d34be6f54efbb695 (diff) | |
| download | nixpkgs-448dc91db4f17b5e6e1f5c247eb8a847d1378f56.tar nixpkgs-448dc91db4f17b5e6e1f5c247eb8a847d1378f56.tar.gz nixpkgs-448dc91db4f17b5e6e1f5c247eb8a847d1378f56.tar.bz2 nixpkgs-448dc91db4f17b5e6e1f5c247eb8a847d1378f56.tar.lz nixpkgs-448dc91db4f17b5e6e1f5c247eb8a847d1378f56.tar.xz nixpkgs-448dc91db4f17b5e6e1f5c247eb8a847d1378f56.tar.zst nixpkgs-448dc91db4f17b5e6e1f5c247eb8a847d1378f56.zip | |
nixos/cri-o: source cni and crictl from package
| -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..c71035c338d 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.conf".source = "${cfg.package}/etc/cni/net.d/10-crio-bridge.conf"; + environment.etc."cni/net.d/99-loopback.conf".source = "${cfg.package}/etc/cni/net.d/99-loopback.conf"; environment.etc."crio/crio.conf.d/00-default.conf".source = cfgFile; # Enable common /etc/containers configuration |