Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 13 Jun 2025 01:21:51 GMT
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 754bc3dcd3c4 - main - bsdinstall: fix ps3 regression
Message-ID:  <202506130121.55D1LpJH087629@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=754bc3dcd3c42c0342978eb9fb5143b6fce2b33c

commit 754bc3dcd3c42c0342978eb9fb5143b6fce2b33c
Author:     Chattrapat Sangmanee <aomsin27@hotmail.co.th>
AuthorDate: 2025-02-07 21:31:56 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2025-06-13 01:21:45 +0000

    bsdinstall: fix ps3 regression
    
    b6644f5 introduces FREEBSD_BOOTLABEL="FreeBSD" as default value
    but cc42ef5 removed this line, expecting it to be set by update_uefi_bootentry()
    
    But ps3 don't use this function so its broken completely.
    
    So we add this line back.
    
    Signed-off-by: Chattrapat Sangmanee <aomsin27@hotmail.co.th>
    Reviewed by: imp
    Pull Request: https://github.com/freebsd/freebsd-src/pull/1594
---
 usr.sbin/bsdinstall/scripts/bootconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/usr.sbin/bsdinstall/scripts/bootconfig b/usr.sbin/bsdinstall/scripts/bootconfig
index 618a1966095e..9b330801e409 100755
--- a/usr.sbin/bsdinstall/scripts/bootconfig
+++ b/usr.sbin/bsdinstall/scripts/bootconfig
@@ -29,6 +29,9 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+
+FREEBSD_BOOTLABEL=$OSNAME
+
 f_dprintf "%s: loading_includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202506130121.55D1LpJH087629>