Use new location for OVMF firmware

anatol · anatol · commit 6df7c6069410 · 2024-12-01T13:29:15.000-08:00
ArchLinux removed the old firmware and uses 4M version as a new default
diff --git a/tests/util.go b/tests/util.go
@@ -368,7 +368,7 @@ func buildVmInstance(t *testing.T, opts Opts) (*vmtest.Qemu, error) {
 	}
 
 	if opts.containsESP {
-		params = append(params, "-bios", "/usr/share/ovmf/x64/OVMF.fd")
+		params = append(params, "-bios", "/usr/share/edk2/x64/OVMF.4m.fd")
 
 		// ESP partition contains initramfs and cannot be statically built
 		// we built the image at runtime
@@ -386,7 +386,7 @@ func buildVmInstance(t *testing.T, opts Opts) (*vmtest.Qemu, error) {
 		disks = append(disks, vmtest.QemuDisk{Path: output, Format: "raw"})
 	}
 	if opts.asIso {
-		params = append(params, "-bios", "/usr/share/ovmf/x64/OVMF.fd")
+		params = append(params, "-bios", "/usr/share/edk2/x64/OVMF.4m.fd")
 
 		// ESP partition contains initramfs and cannot be statically built
 		// we built the image at runtime

Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,7 @@ func buildVmInstance(t testing.T, opts Opts) (vmtest.Qemu, error) {`
`368`	`368`	`}`
`369`	`369`
`370`	`370`	`if opts.containsESP {`
`371`		`- params = append(params, "-bios", "/usr/share/ovmf/x64/OVMF.fd")`
	`371`	`+ params = append(params, "-bios", "/usr/share/edk2/x64/OVMF.4m.fd")`
`372`	`372`
`373`	`373`	`// ESP partition contains initramfs and cannot be statically built`
`374`	`374`	`// we built the image at runtime`
`@@ -386,7 +386,7 @@ func buildVmInstance(t testing.T, opts Opts) (vmtest.Qemu, error) {`
`386`	`386`	`disks = append(disks, vmtest.QemuDisk{Path: output, Format: "raw"})`
`387`	`387`	`}`
`388`	`388`	`if opts.asIso {`
`389`		`- params = append(params, "-bios", "/usr/share/ovmf/x64/OVMF.fd")`
	`389`	`+ params = append(params, "-bios", "/usr/share/edk2/x64/OVMF.4m.fd")`
`390`	`390`
`391`	`391`	`// ESP partition contains initramfs and cannot be statically built`
`392`	`392`	`// we built the image at runtime`