From 3c29c1707d35760aca3f81eea6082463837e9e9a Mon Sep 17 00:00:00 2001 From: Zvonko Kaiser Date: Mon, 15 Apr 2024 14:11:56 +0000 Subject: [PATCH] image: Add suffix to image or initrd depending on the NVIDIA driver version Fixes: #9478 We want to keep track of the driver versions build during initrd/image build so update the artifact_name after the fact. Signed-off-by: Zvonko Kaiser --- tools/packaging/guest-image/build_image.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tools/packaging/guest-image/build_image.sh b/tools/packaging/guest-image/build_image.sh index 3f576dddc7..1c68d63c62 100755 --- a/tools/packaging/guest-image/build_image.sh +++ b/tools/packaging/guest-image/build_image.sh @@ -48,6 +48,12 @@ build_initrd() { PULL_TYPE="${PULL_TYPE:-default}" \ COCO_GUEST_COMPONENTS_TARBALL="${COCO_GUEST_COMPONENTS_TARBALL:-}" \ PAUSE_IMAGE_TARBALL="${PAUSE_IMAGE_TARBALL:-}" + + if [[ "$artifact_name" == *"nvidia-gpu"* ]]; then + nvidia_driver_version=$(cat "${builddir}"/initrd-image/*/nvidia_driver_version) + artifact_name=${artifact_name/.initrd/"-${nvidia_driver_version}".initrd} + fi + mv "kata-containers-initrd.img" "${install_dir}/${artifact_name}" ( cd "${install_dir}" @@ -70,6 +76,12 @@ build_image() { PULL_TYPE="${PULL_TYPE:-default}" \ COCO_GUEST_COMPONENTS_TARBALL="${COCO_GUEST_COMPONENTS_TARBALL:-}" \ PAUSE_IMAGE_TARBALL="${PAUSE_IMAGE_TARBALL:-}" + + if [[ "$artifact_name" == *"nvidia-gpu"* ]]; then + nvidia_driver_version=$(cat "${builddir}"/rootfs-image/*/nvidia_driver_version) + artifact_name=${artifact_name/.img/"-${nvidia_driver_version}".img} + fi + mv -f "kata-containers.img" "${install_dir}/${artifact_name}" if [ -e "root_hash.txt" ]; then cp root_hash.txt "${install_dir}/"