From nobody Wed Jun 21 19:26:33 2023 X-Original-To: dev-commits-src-all@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 4QmYQf1knBz4gNns; Wed, 21 Jun 2023 19:26:34 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QmYQd71ZYz46x5; Wed, 21 Jun 2023 19:26:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687375594; 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=n5e0Fp2Njap4iITt4SkgbI9YXMJa86Gl+GszTrZW/PY=; b=OFwttgHYU0ijQ/AoUOS3bncqo3+DPqfwkQpvoEcpwXEtZoh0fOXAgnroTB5Ft+9Qm8JpED 2JT+p6aIsx9eF0/XIe4yDyt5JwOS+rCGvMHNVyD34zHFt8dwVE1VFgpNvnGZbg5yNmQ4kF rd/EI7bzzE3mdyG0qdscpcWuj9PymElh5+qxQNrWETtvX0fO7gj8QHxZy/hYMMYlmjE3fi WX1pWQMXX2jJMy+hGST8UdThrXBD1PHIrtNKSbw+QVxSR18mnbg6E0vXRARzWZIPoBEH2D F2u5e/eBo1YQMETGNzclsLtDVHUPorIrp+kbKENoVnGjP2EChAlcXLhyfCF1Hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687375594; 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=n5e0Fp2Njap4iITt4SkgbI9YXMJa86Gl+GszTrZW/PY=; b=O0PY7gJ6Jg+L0pzGMuA901tCTJqWdd0GQq2LnRhm61dHPWf0n3Xy9cLwPH5/WqDDEhuPb4 CtLYL7dpgDcmccktmDJ44fLu92sIqiugBWQ8kCcPI1oKZcMgQtHW6MV1WNYmQGm2JNu3hb V90zfpV/TQYw9qht7BguKs0PmCPzmo07IVWHHvCyNW7lkTAn2rAEQJFTDVmdtzsUKpohzW K/UJJ6hf5CeQPAsel6yGbI0uWH2z4p20FrnCJjoqglrPp1292WuxRjJL/QnwhV4CFHGcZ4 Ty0Pl4Xes8QNRTxn8NXiVa68PpVV+ZdOhFJ3rNWNM+ervDKr1D7/9slnwVFFig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687375594; a=rsa-sha256; cv=none; b=sZUxRyusr1yvJ7rIuqUVDPrbWu6X6YYSLVhIQkZ45qaAimd2gNMzqCVa7mh5CNeyO2vjna /sEl/RUwXmtD1hneGFShAMIRnXp87tzOD18tvTzWV1BtmwuptsUknIaBLPLxhuAPhK+c3A AnMWQxtWb990GvJIdIO8LW3trQowhWLvRTrbbQF4YYwdKMP646Y/AqRlgbqcC5eAiwOxc8 2odhi1piM1GC7LBNtCnvVQJ2Sgu0BHUncvmaIDsQta845IVwthMB8OnxyWuKFzFArSQ16r YUTkXt/4xGyYVLjTjnDnvT+3680e2Xv9sedt6Dgc2ThnQ4iT87QN2hqyL2PwXg== 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 4QmYQd64wVzt82; Wed, 21 Jun 2023 19:26:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35LJQXPw019312; Wed, 21 Jun 2023 19:26:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35LJQXFh019311; Wed, 21 Jun 2023 19:26:33 GMT (envelope-from git) Date: Wed, 21 Jun 2023 19:26:33 GMT Message-Id: <202306211926.35LJQXFh019311@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 1178acf46604 - stable/13 - EC2: Default to "uefi-preferred" boot mode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1178acf46604c54e2661284af17452c4db6b2f6f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1178acf46604c54e2661284af17452c4db6b2f6f commit 1178acf46604c54e2661284af17452c4db6b2f6f Author: Colin Percival AuthorDate: 2023-06-07 22:17:12 +0000 Commit: Colin Percival CommitDate: 2023-06-21 19:26:00 +0000 EC2: Default to "uefi-preferred" boot mode In EC2, UEFI boots faster than BIOS, but not all amd64 instance types support UEFI. AMIs need to have their boot mode designated, which created a dilemma: Faster boots, or wider compatibility? The recently added "uefi-preferred" option solves this: AMIs can be marked to use UEFI where it's available, but fall back to BIOS on instance types which do not support UEFI. This uses bsdec2-image-upload 1.4.6, which recently landed in the ports tree. PR: 265697 Reviewed by: delphij, imp MFC after: 1 week Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D40470 (cherry picked from commit bcf9147144f3499976a623f92712ecd0aca71912) --- release/Makefile.ec2 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/release/Makefile.ec2 b/release/Makefile.ec2 index 3a3f6232333d..035137e61d53 100644 --- a/release/Makefile.ec2 +++ b/release/Makefile.ec2 @@ -25,11 +25,14 @@ SSMOPTS= --ssm-name ${SSMPREFIX}/${TARGET_ARCH:S/aarch64/arm64/}/base/ufs/${REVI EC2ARCH= --${TARGET_ARCH:S/aarch64/arm64/} .endif .if !defined(AMIBOOTMETHOD) -AMIBOOTMETHOD= UEFI +AMIBOOTMETHOD= UEFI-PREFERRED .endif .if ${AMIBOOTMETHOD} == "UEFI" && ${TARGET_ARCH} == "amd64" BOOTMODEOPT= --uefi .endif +.if ${AMIBOOTMETHOD} == "UEFI-PREFERRED" && ${TARGET_ARCH} == "amd64" +BOOTMODEOPT= --uefi-preferred +.endif CLEANFILES+= ec2ami