From owner-dev-commits-src-main@freebsd.org Wed Mar 3 14:13:30 2021 Return-Path: Delivered-To: dev-commits-src-main@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 5D13456BB66; Wed, 3 Mar 2021 14:13:30 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DrGF40bKHz3pFk; Wed, 3 Mar 2021 14:13:28 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from comporellon.tachypleus.net (unknown [IPv6:2601:405:4a00:acd:cc7b:682b:f804:9afd]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: nwhitehorn/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 83FF2217FA; Wed, 3 Mar 2021 14:13:26 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Subject: Re: git: 2c26d77d989a - main - Remove /boot/efi from mtree, missed in 0b7472b3d8d2. To: Brandon Bergren , rgrimes@FreeBSD.org Cc: Ed Maste , Warner Losh , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@FreeBSD.org References: <202103031253.123CrxKG051357@gndrsh.dnsmgr.net> <14d09680-1036-4a7e-8a0e-c3063cac8bc9@www.fastmail.com> From: Nathan Whitehorn Message-ID: Date: Wed, 3 Mar 2021 09:13:25 -0500 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.8.0 MIME-Version: 1.0 In-Reply-To: <14d09680-1036-4a7e-8a0e-c3063cac8bc9@www.fastmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Mar 2021 14:13:30 -0000 On 3/3/21 9:05 AM, Brandon Bergren wrote: > On Wed, Mar 3, 2021, at 6:53 AM, Rodney W. Grimes wrote: >> What am I missing here? One place I am being told this is run in >> an environment that may not even be an EFI booted system, and in >> another place it is being used as a test if something is mounted >> on it, which should only be true on an EFI booted system. > That the script in question is a generic script that runs as part of bsdinstall on every platform and has to be universal. > > The actual *problem* here is that usr.sbin/bsdinstall/scripts/bootconfig has a default case that is > *) die "Unsupported arch $(uname -m) for UEFI install" > > which then causes the main script to bail out, leaving the system in a half-installed state. > > If that had just been an exit 0 this would have never been a problem, I suppose. > > Before the original change that broke this, there was a check that the script was not running on powerpc or mips platforms before running the efi bits, but this got taken out. > Well, incidentally. The bootconfig script needs to know if there is an ESP it should configure, but the signalling mechanism (the presence of the ESP mount point) was being broken by mtree making that directory unconditionally even on systems that don't use EFI. So then bootconfig tried to set it up, but failed later on, because there was no EFI loader to set up. The mtree change makes the ESP mount point only exist on systems with an ESP. -Nathan