mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-11-25 12:31:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1915 from flatcar/kai/qemu-script-img-name

Browse Source 
build_library: Use original qemu image name in qemu script
This commit is contained in:
Kai Lüke 2024-04-17 12:54:20 +02:00 committed by GitHub
commit ebe12abfdc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
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
} }