From owner-dev-commits-src-all@freebsd.org Tue Mar 2 18:24:13 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5A14D54B483; Tue, 2 Mar 2021 18:24:13 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4Dqlrr70mnz4rD5; Tue, 2 Mar 2021 18:24:12 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id 122IO54v047873; Tue, 2 Mar 2021 10:24:05 -0800 (PST) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 122IO5S4047872; Tue, 2 Mar 2021 10:24:05 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <202103021824.122IO5S4047872@gndrsh.dnsmgr.net> Subject: Re: git: 2c26d77d989a - main - Remove /boot/efi from mtree, missed in 0b7472b3d8d2. In-Reply-To: <202103021650.122Go2nt061428@gitrepo.freebsd.org> To: Nathan Whitehorn Date: Tue, 2 Mar 2021 10:24:05 -0800 (PST) CC: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 4Dqlrr70mnz4rD5 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Mar 2021 18:24:13 -0000 > The branch main has been updated by nwhitehorn: > > URL: https://cgit.FreeBSD.org/src/commit/?id=2c26d77d989abe48c662eeb6f52f7e4c9b81680c > > commit 2c26d77d989abe48c662eeb6f52f7e4c9b81680c > Author: Nathan Whitehorn > AuthorDate: 2021-03-02 16:47:00 +0000 > Commit: Nathan Whitehorn > CommitDate: 2021-03-02 16:49:41 +0000 > > Remove /boot/efi from mtree, missed in 0b7472b3d8d2. > > This had prevented the bootconfig step from determining if an ESP exists, > resulting in its unconditional setup. On BIOS-booted amd64, this wasn't > harmful, just unnecessary, but it resulted in failed installations on > non-EFI-supporting platforms like powerpc64. > > MFC after: 3 days We certainly must have a better way to detect EFI or not than the existance of /boot/efi???? I would of thought that machdep.bootmethod == EFI was the defanitive way to detect this? > --- > etc/mtree/BSD.root.dist | 2 -- > release/tools/arm.subr | 1 + > 2 files changed, 1 insertion(+), 2 deletions(-) > > diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist > index f734f7891429..1dc9e179b0fc 100644 > --- a/etc/mtree/BSD.root.dist > +++ b/etc/mtree/BSD.root.dist > @@ -18,8 +18,6 @@ > rockchip tags=package=runtime > .. > .. > - efi > - .. > firmware > .. > loader.conf.d tags=package=bootloader > diff --git a/release/tools/arm.subr b/release/tools/arm.subr > index 343d9f3a7034..2f91490c0859 100644 > --- a/release/tools/arm.subr > +++ b/release/tools/arm.subr > @@ -184,6 +184,7 @@ arm_install_base() { > TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \ > DESTDIR=${DESTDIR} KERNCONF=${KERNEL} \ > ${CONF_FILES} installworld installkernel distribution > + chroot ${CHROOTDIR} mkdir -p ${DESTDIR}/boot/efi > chroot ${CHROOTDIR} mkdir -p ${DESTDIR}/boot/msdos > > arm_create_user > -- Rod Grimes rgrimes@freebsd.org