From 4a8663e6d2b0c980ff29753a3ad70cdccea63236 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 1 Jan 2023 12:14:11 +1000 Subject: [PATCH] cri-o: install cni and crictl files --- pkgs/applications/virtualization/cri-o/default.nix | 3 +++ pkgs/applications/virtualization/cri-o/wrapper.nix | 1 + 2 files changed, 4 insertions(+) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 4f54b4044cd0..7d197d30b939 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -54,6 +54,9 @@ buildGoModule rec { installShellCompletion --$shell completions/$shell/* done + install contrib/cni/*.conf -Dt $out/etc/cni/net.d + install crictl.yaml -Dt $out/etc + installManPage docs/*.[1-9] runHook postInstall ''; diff --git a/pkgs/applications/virtualization/cri-o/wrapper.nix b/pkgs/applications/virtualization/cri-o/wrapper.nix index b220c8e29cbf..5d15847d9c3e 100644 --- a/pkgs/applications/virtualization/cri-o/wrapper.nix +++ b/pkgs/applications/virtualization/cri-o/wrapper.nix @@ -40,6 +40,7 @@ in runCommand cri-o-unwrapped.name { ln -s ${cri-o-unwrapped.man} $man mkdir -p $out/bin + ln -s ${cri-o-unwrapped}/etc $out/etc ln -s ${cri-o-unwrapped}/share $out/share for p in ${cri-o-unwrapped}/bin/*; do