mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-24 15:11:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

build_library: Use original qemu image name in qemu script

Browse Source 
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.
This commit is contained in:
Kai Lueke 2024-04-17 12:19:08 +09:00
parent 9c91741f3e
commit 2e3f175fc1
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build_library/vm_image_util.sh
View File

@ -812,10 +812,14 @@ _write_qemu_uefi_conf() {
# We now only support building qemu_uefi and generate the # We now only support building qemu_uefi and generate the
# other artifacts from here # other artifacts from here
if [ "${VM_IMG_TYPE}" = qemu_uefi ]; then 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 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 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 fi
} }