summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-11-04 21:02:50 +0100
committerChristian Poessinger <christian@poessinger.com>2021-11-04 21:02:50 +0100
commitec168f3d2cede849c66d078a3df0514dc1ed65a0 (patch)
tree50a75b31da447edf40bc9eb6548125decf42ddcc
parent6d7a0c49c67a4dccdcbfe5b3b35f8ec3afa966b8 (diff)
downloadvyos-build-ec168f3d2cede849c66d078a3df0514dc1ed65a0.tar.gz
vyos-build-ec168f3d2cede849c66d078a3df0514dc1ed65a0.zip
Testsuite: use individual UUID/name per UEFI/BIOS instance
-rwxr-xr-xscripts/check-qemu-install5
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install
index 39cbf266..a2a7f054 100755
--- a/scripts/check-qemu-install
+++ b/scripts/check-qemu-install
@@ -118,8 +118,11 @@ def get_qemu_cmd(name, enable_kvm, enable_uefi, disk_img, iso_img=None):
cpu = ""
uefi = ""
+ uuid = "f48b60b2-e6ad-49ef-9d09-4245d0585e52"
if enable_uefi:
uefi = "-bios /usr/share/OVMF/OVMF_CODE.fd"
+ name = f"{name}-UEFI"
+ uuid = "d27cf29e-4419-4407-8f82-dc73d1acd184"
cdrom = ""
if iso_img:
@@ -143,7 +146,7 @@ def get_qemu_cmd(name, enable_kvm, enable_uefi, disk_img, iso_img=None):
-netdev user,id=n6 -device virtio-net-pci,netdev=n6,mac={macbase}:06 \
-netdev user,id=n7 -device virtio-net-pci,netdev=n7,mac={macbase}:07 \
-machine accel=kvm \
- -uuid f48b60b2-e6ad-49ef-9d09-4245d0585e52 \
+ -uuid {uuid} \
-nographic {cpu} {cdrom} {kvm} \
-drive format=raw,file={disk_img}'