From e75435944fb1c5600e64513a535b5005182c6c1c Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Mon, 3 Jul 2023 11:05:04 +0100 Subject: [PATCH] guest-image: Add failure check Handle unknown image_initrd_suffix better Signed-off-by: stevenhorsman --- tools/packaging/guest-image/build_image.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/packaging/guest-image/build_image.sh b/tools/packaging/guest-image/build_image.sh index 14cc170086..7b2faa93c2 100755 --- a/tools/packaging/guest-image/build_image.sh +++ b/tools/packaging/guest-image/build_image.sh @@ -140,6 +140,13 @@ main() { img_os_version=$(get_from_kata_deps "assets.image.architecture.${arch_target}.version") image_name="kata-${img_distro}-${img_os_version}-${image_initrd_suffix}.${image_type}" final_image_name="${final_image_name}-${image_initrd_suffix}" + + initrd_distro=$(get_from_kata_deps "assets.initrd.architecture.${arch_target}.name") + initrd_os_version=$(get_from_kata_deps "assets.initrd.architecture.${arch_target}.version") + initrd_name="kata-${initrd_distro}-${initrd_os_version}-${image_initrd_suffix}.${image_type}" + final_initrd_name="${final_initrd_name}-${image_initrd_suffix}" + elif [ -n "${image_initrd_suffix}" ]; then + die "Invalid image_initrd_suffix ${image_initrd_suffix}" fi ;; root_hash_suffix=*)