From 464f0f1636cd31aaf3b19d81d9626ea6ff2ecc84 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Thu, 25 Jul 2024 14:41:17 +0200 Subject: [PATCH] kata.kata-image: optionally include pause-bundle Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- packages/by-name/kata/kata-image/package.nix | 46 ++++++++++++-------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/packages/by-name/kata/kata-image/package.nix b/packages/by-name/kata/kata-image/package.nix index 802e9d7f46..24651aaeb1 100644 --- a/packages/by-name/kata/kata-image/package.nix +++ b/packages/by-name/kata/kata-image/package.nix @@ -22,6 +22,9 @@ cryptsetup, closureInfo, erofs-utils, + # pause-bundle is needed for nydus-snapshotter + withPauseBundle ? true, + pause-bundle, }: let @@ -38,25 +41,30 @@ let inherit (kata.kata-runtime) src version; # https://github.com/microsoft/azurelinux/blob/59ce246f224f282b3e199d9a2dacaa8011b75a06/SPECS/kata-containers-cc/mariner-coco-build-uvm.sh#L34-L41 - buildPhase = '' - runHook preBuild - - mkdir -p /build/rootfs/etc/kata-opa /build/rootfs/usr/lib/systemd/system /build/rootfs/nix/store - cp src/agent/kata-agent.service.in /build/rootfs/usr/lib/systemd/system/kata-agent.service - cp src/agent/kata-containers.target /build/rootfs/usr/lib/systemd/system/kata-containers.target - cat > /build/rootfs/etc/kata-opa/default-policy.rego < /build/rootfs/etc/kata-opa/default-policy.rego <