git: 7cd9d3fe838c - releng/15.0 - vmrun.sh: Don't require firmware on amd64 unless -E was specified

From: Colin Percival <cperciva_at_FreeBSD.org>
Date: Sun, 19 Oct 2025 23:51:04 UTC
The branch releng/15.0 has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=7cd9d3fe838c0ff77e4de9c1570856f261d96f18

commit 7cd9d3fe838c0ff77e4de9c1570856f261d96f18
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2025-10-16 14:48:39 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2025-10-19 23:50:44 +0000

    vmrun.sh: Don't require firmware on amd64 unless -E was specified
    
    Approved by:    re (cperciva)
    PR:             290232
    Reported by:    David Marker <dave@freedave.net>
    Fixes:          aa34b1d20e44 ("vmrun.sh: Add arm64 support")
    MFC after:      3 days
    
    (cherry picked from commit f19f17b3af675fbbc1244b66bbd8fb4a9836cb02)
    (cherry picked from commit 6c5540eebcf25e3f81c3ec9bfa762390d2a86885)
---
 share/examples/bhyve/vmrun.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/share/examples/bhyve/vmrun.sh b/share/examples/bhyve/vmrun.sh
index 52935363023a..e0052e781dc0 100755
--- a/share/examples/bhyve/vmrun.sh
+++ b/share/examples/bhyve/vmrun.sh
@@ -268,8 +268,10 @@ fi
 if [ -z "$firmware" ]; then
 	case ${platform} in
 	amd64)
-		firmware="${efi_firmware}"
-		firmware_pkg="edk2-bhyve"
+		if [ ${efi_mode} -ne 0 ]; then
+			firmware="${efi_firmware}"
+			firmware_pkg="edk2-bhyve"
+		fi
 		;;
 	arm64)
 		firmware="${uboot_firmware}"