From 2e3f175fc177cca7ec48ad542608eee54a28e1b8 Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Wed, 17 Apr 2024 12:19:08 +0900 Subject: [PATCH] build_library: Use original qemu image name in qemu script The move to symlinking to the qemu-uefi image also resulted in the qemu-uefi image being referenced in the qemu-bios and qemu-uefi-secure scripts instead of referencing the image symlinks. Same for the VM name shown in the qemu window title. When generating the qemu scripts, use the original qemu image name and VM name. --- build_library/vm_image_util.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh index 48f98188866..372249dff85 100644 --- a/build_library/vm_image_util.sh +++ b/build_library/vm_image_util.sh @@ -812,10 +812,14 @@ _write_qemu_uefi_conf() { # We now only support building qemu_uefi and generate the # other artifacts from here if [ "${VM_IMG_TYPE}" = qemu_uefi ]; then + local qemu="${VM_DST_IMG/qemu_uefi/qemu}" + local qemu_uefi_secure="${VM_DST_IMG/qemu_uefi/qemu_uefi_secure}" + local qemu_name="${VM_NAME/qemu_uefi/qemu}" + local qemu_uefi_secure_name="${VM_NAME/qemu_uefi/qemu_uefi_secure}" if [ "${BOARD}" = amd64-usr ]; then - VM_IMG_TYPE=qemu _write_qemu_conf + VM_IMG_TYPE=qemu VM_DST_IMG="${qemu}" VM_NAME="${qemu_name}" _write_qemu_conf fi - VM_IMG_TYPE=qemu_uefi_secure _write_qemu_uefi_secure_conf + VM_IMG_TYPE=qemu_uefi_secure VM_DST_IMG="${qemu_uefi_secure}" VM_NAME="${qemu_uefi_secure_name}" _write_qemu_uefi_secure_conf fi }