From nobody Sun Aug 24 20:50:28 2025 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 4c95fX4Kyjz661ZJ; Sun, 24 Aug 2025 20:50:28 +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 4c95fX3qlqz3PVf; Sun, 24 Aug 2025 20:50:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756068628; 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=YJgqun7hb6n7n4VF7z8WmENClxpxi8+qc9DKAr2+R6Q=; b=kjz6GNHypZ5ufMw/+7907zolI0FkXv9kZOtIIGl3TnzqRDjCcRsFaBmxVF4ljmQNMR3+CX NXyONU4EBiaQDNQzQiXhJGyovbRoHAsvyVKvrpECzmWOxxUkA/8noS8sVZb/VFyERo9DEb KGgPLscsVR70l4PFAyaN1jbfShnEOAof0t4waeHQ/y0UUCksTjCjgN5iBWwH6/XcyAQghD +Z2trsyiY7xAVEOIj9P1T3b/eM/pP1DnJBuQtdFJEM3nioTe+KmpuWja875281aJvAZ1Oh wnLnEQHCseiVeYKyAhiAtq4rPtbjUUDNWI4OG5xfwAQbALtE86oiN8HsoyhNrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756068628; 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=YJgqun7hb6n7n4VF7z8WmENClxpxi8+qc9DKAr2+R6Q=; b=heRsCPB91BBU3f90KTfGTX+SrIvmX4tum5UuB9VMeFwKkGgxPD0O/zcCLX4oHaOuQMF98q XE3Uk7fSWwgnm9uK5nnG2FFT+56pRPwHx4yBveS/70zZMPt45TZMDt4Kgj9R+palx5n4wP xB2hNNy+8eKxOMd+dxlgmhtx55vi8B9Q3jt00runoxxqjwREZApofFlUn1phWCFDctlFzh fUOr8+dmtjcqrmKuQBEVTkV/rQ0FrjuS93ZSIwhZqljz8sd1V/VBbu7WuVQdNQhvgTItn/ REigtaB+vgLKuYa+BajtM6rfdJyGdVA99DPKq/HGSEuHrB2VN5CkdoXCraJSQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756068628; a=rsa-sha256; cv=none; b=Mx1EOXUgQtvABTAlYD38DTl5S+GVQ45lGs2MTKVVjfB9bas7cRutOOa5oIocvub5RUoPHq ulkwSr5b2HcVhgkdh8yM5su05DTgn6fGHF6+lI/fH73zSn7lcTRJkQOWcJooc2M7ainUKp SGh5ipAvRzUTrVB0qtI132/8xGqSFEatUEDZP8AjF5YZ7Zaxn3/D199Tr5IywQyEfdE35I fobnjTA9GYUP6hMHTJv64kTqbC/f+ZaB+DYiuT4GrSXjQqOtepI4Suyn5ONeEQO8UE19Yh W/nPCd0IP0ztZnKspRLxsw9ttZGWn0K+Ey1+xteMbPriX5yfUhTkuYvIZxmysA== 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 4c95fX3QCFz43k; Sun, 24 Aug 2025 20:50:28 +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 57OKoS2G048312; Sun, 24 Aug 2025 20:50:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57OKoSRr048309; Sun, 24 Aug 2025 20:50:28 GMT (envelope-from git) Date: Sun, 24 Aug 2025 20:50:28 GMT Message-Id: <202508242050.57OKoSRr048309@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 53b021680ed9 - stable/14 - bsdinstall: Improve message for existing FreeBSD EFI entry 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 53b021680ed97b7169ffc244894a8f8179867ac6 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=53b021680ed97b7169ffc244894a8f8179867ac6 commit 53b021680ed97b7169ffc244894a8f8179867ac6 Author: Ed Maste AuthorDate: 2025-07-25 14:25:18 +0000 Commit: Ed Maste CommitDate: 2025-08-24 20:49:40 +0000 bsdinstall: Improve message for existing FreeBSD EFI entry When reinstalling FreeBSD bsdinstall reported "There are multiple FreeBSD EFI boot entries." This sounds like something went wrong in the past. Clarify that there may be only one existing entry, which is not surprising for a reinstall. Reviewed by: manu, ziaee Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51527 (cherry picked from commit ebc6ff8db17683b566d49fe89a43a668d3d67915) --- usr.sbin/bsdinstall/scripts/bootconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/bootconfig b/usr.sbin/bsdinstall/scripts/bootconfig index 618a1966095e..6438f7ef1fca 100755 --- a/usr.sbin/bsdinstall/scripts/bootconfig +++ b/usr.sbin/bsdinstall/scripts/bootconfig @@ -71,7 +71,7 @@ update_uefi_bootentry() fi $DIALOG --backtitle "$OSNAME Installer" --title 'Boot Configuration' \ - --yesno "There are multiple \"$OSNAME\" EFI boot entries. Would you like to remove them all and add a new one?" 0 0 + --yesno "One or more \"$OSNAME\" EFI boot manager entries already exist. Would you like to remove them all and add a new one?" 0 0 if [ $? -eq $DIALOG_OK ]; then for entry in $(efibootmgr | awk "\$NF == \"$EFI_LABEL_NAME\" { sub(/.*Boot/,\"\", \$1); sub(/\*/,\"\", \$1); print \$1 }"); do efibootmgr -B -b ${entry}