From nobody Sat Jul 26 20:07:14 2025 X-Original-To: dev-commits-src-main@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 4bqG430zC2z62QW6; Sat, 26 Jul 2025 20:07:15 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bqG4224VPz3jfS; Sat, 26 Jul 2025 20:07:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753560434; 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=qJRofAVCoh62h4C3WJckayW/OzsDxwA252p6j7jH6kg=; b=xBJjfQhbbFpVJCPEDrV6kcT1/oyhLfs644MoT0AISrWfAGjzQylJDNk9NotvG0QkEPPgBq 3AsTLYeQTy0/asbkazpKV8P9pI+dPVmoAv6jDjmG5oF3nDElW4UTH2CtjVDzG8pgJdJiHJ nah6BnpfqakRI27KvbWjobuA3fsTweUtGFycxHIVzxHcre0RpeuPOqO9MXbDYZrO478k3x pHeVKUrAm67oDuxJngbsPDqu3rXuSQW+pGwo93laUvAJr1+DmPp5SQSxRqJFEvy6eOQKbi R/KY7mscJLdUYE2KPwkXVpamAQxA8l22nqeGTofVigOO5wzFAS33fwnBDexe7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753560434; 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=qJRofAVCoh62h4C3WJckayW/OzsDxwA252p6j7jH6kg=; b=Bp9xx56d90iKgz8Y1huK4Nz9VZQdWmlkL6Jqcv4zWhywdihcmTJRR+jAMivX02X1aBgXou AU5FO71jNo5iOsD+v7Wu0PB0/4fMuf/d7FSOL15h1EE8IBM2NVGQJGYzfBfAgSSVMMnDEu +ZtYgX5VNQ5nMUAhx6GEnG/DfUN0xEBgYEen6j2dOAOxrZDbsebgepcNlHuTYd9DNidTxH 5/asC8MRK5zAirZnlLQpaBNsPPJ3Rz3TNkrykYAwtOYYj723w2en1SbkrZUbLrJJ5m3x+g t1SV3i49ImH1ixrqsvHIgm+Via1k1GWHHyRdokofJyMB/MqkE3moWetPEAwjmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753560434; a=rsa-sha256; cv=none; b=iUVcVKDV0VhQsEPApuR+D7gtq6wRAu0EYUMhWzKUR3+r8tXTCiyL+9MzcHbJN2U35sN4up IOmEd1k++uddJMk5HVy8AKa/muDLRdh9Llq67pDmyEWxZDQhzxIY/eQBOh0Kc4tpMI/7ZC L2shQ7sxK/mPZZJk8Dc1M/juZ8n6c5uv/GP2wEhXUO7BImkS2RhvByWHdU0W8rpHz7dhu1 XW/KvT9JcnrNZj7IAHdzAapuc7UdieXW9yMU/3OVFa8+OwLRXjRHbAoh2p2oP1c1blF1TS zew+lqRsvl68CfkjbfLY8RQbKTLC6520zrbYGgi/cCL+BBmWLI3/WyffoCT+cA== 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 4bqG420rngzkwQ; Sat, 26 Jul 2025 20:07:14 +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 56QK7EJs004329; Sat, 26 Jul 2025 20:07:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56QK7EFH004326; Sat, 26 Jul 2025 20:07:14 GMT (envelope-from git) Date: Sat, 26 Jul 2025 20:07:14 GMT Message-Id: <202507262007.56QK7EFH004326@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: ebc6ff8db176 - main - bsdinstall: Improve message for existing FreeBSD EFI entry List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: ebc6ff8db17683b566d49fe89a43a668d3d67915 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ebc6ff8db17683b566d49fe89a43a668d3d67915 commit ebc6ff8db17683b566d49fe89a43a668d3d67915 Author: Ed Maste AuthorDate: 2025-07-25 14:25:18 +0000 Commit: Ed Maste CommitDate: 2025-07-26 20:06:22 +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 --- 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 9b330801e409..41243ad14b9b 100755 --- a/usr.sbin/bsdinstall/scripts/bootconfig +++ b/usr.sbin/bsdinstall/scripts/bootconfig @@ -74,7 +74,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}