summaryrefslogtreecommitdiff
path: root/scripts
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:03:24 +0100
commit1da6287f178977ce8c7c001e9c04c5b08d3592df (patch)
tree5ec6d882fb3dd290c63beafc87c4a1a2e69c0f70 /scripts
parent9c30efd7742c8e638ea568982f6743650430ce7a (diff)
downloadvyos-build-1da6287f178977ce8c7c001e9c04c5b08d3592df.tar.gz
vyos-build-1da6287f178977ce8c7c001e9c04c5b08d3592df.zip
Testsuite: use individual UUID/name per UEFI/BIOS instance
(cherry picked from commit ec168f3d2cede849c66d078a3df0514dc1ed65a0)
Diffstat (limited to 'scripts')
-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 d7a07101..d2a8f25f 100755
--- a/scripts/check-qemu-install
+++ b/scripts/check-qemu-install
@@ -112,8 +112,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:
@@ -134,7 +137,7 @@ def get_qemu_cmd(name, enable_kvm, enable_uefi, disk_img, iso_img=None):
-netdev user,id=n3 -device virtio-net-pci,netdev=n3,mac={macbase}:03 \
-netdev user,id=n4 -device virtio-net-pci,netdev=n4,mac={macbase}:04 \
-machine accel=kvm \
- -uuid f48b60b2-e6ad-49ef-9d09-4245d0585e52 \
+ -uuid {uuid} \
-nographic {cpu} {cdrom} {kvm} \
-drive format=raw,file={disk_img}'