From nobody Wed Jun 14 18:32:08 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 4QhDY46RXyz4dWZB; Wed, 14 Jun 2023 18:32:08 +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 4QhDY45tj3z3P1X; Wed, 14 Jun 2023 18:32:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686767528; 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=C7IyeyIks7GGMwK0doyxBpvCakBy6yKN4VTjXDKuhf8=; b=MV1Dd4z5H0ohHgEqoevwOv0ephGN5uhguPTonbMDZdmJN8jzl4t3JSBTXHaFkcV+7cIWZ/ OzFATxyuwnB0h2RO+8Pyb0IRx9Gp7+VG80k3SZGNmWn8g7WLALRihSQ0uOb/gv02vBFc30 zfScNWP5xzNBYjBmgY3pzDZbggNEhZYxLFB99b70YtLLEI270ua4JBUOPLChDDmI+6eIYD KURSKmkV5xSzJUq+yriNOVWzSQk8zAv1iTxein6BJmax1v/XqZxRMQIJdNHevT3uXJKZuT VSIKOzVAT8GhtbRAdZeC/Pbm9zXZji3oBiLl+tDJxPb7Yp4HysUzA4lz/pTVBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686767528; 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=C7IyeyIks7GGMwK0doyxBpvCakBy6yKN4VTjXDKuhf8=; b=H4NDfir0yI02aWwXCLgXwvqHo4f7nlAPNpnTmUHi4XI8d5mJUnlmn0GBPsgl62zLl0KuB5 ov02fZIU+IAherFQFth9Fzqh7gog89QZNHqsFsu1eJ6LZITXv1iC4zpL+kaGo2lG1RRE5j Mr9t+C4BqhlP3mEzpMGkzv/yGo/i3xy+DfRgGotr8gmaMG72RcybI4W9WU8mNl9Iw5x0ry lzoYyArjw58woRRXZuFda8bb6TY/AWiD26RutHsONnhGOhiKJ4dHnSCEhtMGoWRSzrR8VO hBCYJcMRmHUFQTYcWZqbZuS9HuvC6BlXt1XgSJMuJA9RSM7MqKg+i74G/i8huA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686767528; a=rsa-sha256; cv=none; b=Pe+n6w/CLg8AS3lUD36B3F6pM6ZggtMFWgpktBESmBqV/DsV710yaEX/2NQxjxD0yVQrBG c98hFrR8xcLooSN+P7RYlRHTWvdbV5ia4TaX6yn3hvR6YtK19ar5T0RBT1/Yy1YdF0xW0L ZTDPvvyn9xB2LeqowJEV4QalPYBnM3/4fCQRDKuhXei44ANbeAM24CDbM3PcHU7N4Y1pW5 Jwn+RREi5cI3z7K9P8wqjWklzAdzOVlkkHgTrU9lZO/9MIlQqn9B+YVNo3vLRGiv+6hGJl ZbV8ZBQkYUIdq/Ympt+TYS7nBzMbN5iz0ysgYwZ/nc8PoiFbtdyUNCi5cHxSow== 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 4QhDY44xmmzDyd; Wed, 14 Jun 2023 18:32:08 +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 35EIW8aq006452; Wed, 14 Jun 2023 18:32:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35EIW8ZW006451; Wed, 14 Jun 2023 18:32:08 GMT (envelope-from git) Date: Wed, 14 Jun 2023 18:32:08 GMT Message-Id: <202306141832.35EIW8ZW006451@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: bcf9147144f3 - main - 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/main X-Git-Reftype: branch X-Git-Commit: bcf9147144f3499976a623f92712ecd0aca71912 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=bcf9147144f3499976a623f92712ecd0aca71912 commit bcf9147144f3499976a623f92712ecd0aca71912 Author: Colin Percival AuthorDate: 2023-06-07 22:17:12 +0000 Commit: Colin Percival CommitDate: 2023-06-14 18:31:10 +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 --- release/Makefile.ec2 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/release/Makefile.ec2 b/release/Makefile.ec2 index b29f54715fb3..e26f4f705cc6 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