From nobody Thu Oct 16 14:52:00 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cnWBS5Kdyz6CcFg; Thu, 16 Oct 2025 14:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cnWBS4LfNz3K0Z; Thu, 16 Oct 2025 14:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760626320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4EWm1hmi6ZqZ1F75/1LqqGueHAdsiO5PVkoJ0qixzHU=; b=eFNcUVxpEH1FSOIqDEMMppc4Ex9yLIuDlaqavCJCUqKjWgLiCptCUNFLbl105Y0JnE3tjb Pn2+SwmjLjwNZRI0WK1egVL+fyC8gm402u2+WoApP7CLKD78d+723wKSd+I8CAoCUF0xwe HgIjcB88WmnP43KVLl3UVANzwO5lXXPyQ2I9RVSzsLLIAuH4XLY7WtbKKXpPNlD2p390+f sshwhxh3EIVRVLnoxuNDzY2BplnVq8Uh+qnhu/esNeHTomNVdMtXale9koWVUFjVmv8wWF T00zefRN9GKuk/USFOIBxdgy5oSVICZoOxzqkq4kt+os6EKlgtogvJ2cP949bA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760626320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4EWm1hmi6ZqZ1F75/1LqqGueHAdsiO5PVkoJ0qixzHU=; b=FUU7W6AhGYFezAHBfc7HlYoM0u3ileCd3/OBJzCZXHYID0c1ddzuwKksa0KL0XTiGCX/hp KTMYVn77PiVO4FAqVS4kk8SZ1pe5ULrH1iYVM4b/RN0Duk+RL7Fzn0kuP91n0jUUoUKH4g v0ElsSqgwCvy7Ee5V9Cyuq4UwH5HeZHKwgOQc5JYOqihFLw2NZhL+btqxJ3L8spAkLEGJA VENtlcaNRBCXV3rA3IvEAt3fxWkPdx/DdOvyOFFrlPqDUx+8F+tm5Wene3DuqXlU8ECVND yoSyh1XenlCUWXMfDIX+/llegtTBs2qwnyv4jb2ATvJj5GSlTK225pY+3p45fQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760626320; a=rsa-sha256; cv=none; b=O9M6vp+MWxCvLWq/PEGyaRZwGPao1bXk07xwHIlgBI4bHOvHiCWGYJbqCWy6ft0m+Gwmzf v4ldzwFjPvKGHZumT6m/GFg8847mL4tsi1O3hP7u1Qyl0RHNXspytStqe6v9i2XceiyN/A VC23vS3+LgM3H/aHyz+EI90BCXnfiIt2dZAPKefvHrqYeSwvPw/Qq9DkjzXD2RAxjH7qk+ GwiPCQTvYjwGbycrofJyrduk8BRRu8tmFwQaPDWDWEKAS8Hh3TJmH/RvxMWO2v1OYcZ6Nd /9Bn/3CYHOyzCdP7aUXcgD9pO7BJxGFIp6peRqa7jiz708Q3M9AtQcc9jwODVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cnWBS3t9vz1RBP; Thu, 16 Oct 2025 14:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59GEq0YS027100; Thu, 16 Oct 2025 14:52:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59GEq0OR027097; Thu, 16 Oct 2025 14:52:00 GMT (envelope-from git) Date: Thu, 16 Oct 2025 14:52:00 GMT Message-Id: <202510161452.59GEq0OR027097@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: f19f17b3af67 - main - vmrun.sh: Don't require firmware on amd64 unless -E was specified List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f19f17b3af675fbbc1244b66bbd8fb4a9836cb02 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f19f17b3af675fbbc1244b66bbd8fb4a9836cb02 commit f19f17b3af675fbbc1244b66bbd8fb4a9836cb02 Author: Mark Johnston AuthorDate: 2025-10-16 14:48:39 +0000 Commit: Mark Johnston CommitDate: 2025-10-16 14:50:33 +0000 vmrun.sh: Don't require firmware on amd64 unless -E was specified PR: 290232 Reported by: David Marker Fixes: aa34b1d20e44 ("vmrun.sh: Add arm64 support") MFC after: 3 days --- 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}"