From nobody Fri Jun 13 01:21:51 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 4bJM7M4hW8z5ykMh; Fri, 13 Jun 2025 01:21:51 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bJM7M1rwhz3L1F; Fri, 13 Jun 2025 01:21:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749777711; 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=WOVQbSxqDdgmdQKpYM+l61J+UJLgPFntnOXvX0nysAA=; b=crkj2wUSByAKMH+JzpkDu7RMNvkLy5F9myAa7AkEw/J0SQ2FMPqr1t5k3eBPo2y+91fDAp uBte+7kHrVAAKGIxRg/m/80RNAlh4G9oVoqQGB3Lyn0t+a887TIHOAZ2vl4Rk+8fKlzShC q8DtxvsriwmIxSpu9nc6IyZ5+TEQHIHpL2bosZCDlt4/LbyYuso8qBwLOtvPNOadoCZbf9 MBjk1jxCfOEvuWt1Srk2m3LDrMfp9dI021+SKsZ6o0mhJXiaZbiomXQvjh9W2IYu+dqtYG UeqtFqG4pfq9cV+hQ/7LXj8weauPTZkCoVYl7KzOBSzNOXUAruM3tPLLYOvu4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749777711; 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=WOVQbSxqDdgmdQKpYM+l61J+UJLgPFntnOXvX0nysAA=; b=s9A1ad+9R/K0ClMqmMWJ6UzAKdz8xMPyKPXysE2G6q7nShu2I1mXSu0NoXjulHzC9LDutX CbhxGyn7ApDzlAWJSq4DKTXR3ps+Ypq+wJYn3NxcaM/Nut1j1fCChnowPRURuQNhuUhDkR 5bcwO7tPsX/MSZcJGtmvrOMzE2JtWChNrNzlh1JS219Mw8HqnKHCLVPxOqIxt5tHrxx7R8 pmCU3TakZ1JKHzRyV9SgD7p3DyswXPSgRJz9SkWO2VsUsJS0L05eYlumhtGcJMoxzCXvr8 tneToGtcgrST17nvRgFEizsbEPtbDOER8n1LdFPg+arTidBcQ9r1nAKE/PhghA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749777711; a=rsa-sha256; cv=none; b=fIUgibdmfCGZn3zOeReRMgEyuwfbRNGUB6kjKlknDnf46jdHlkTftVmKWIdUH53nFVtHgS immwaxx1tfp7HfRepnGg+6PexwQdklYgMFOBsiYH4et/81K8qRAFqsLGCRD+jcJgJ+3zQD BI5wtrFF6mcWM0eEwhfVKHfzKomJtHIil7zTPd+AUqul6OM0oJPI3r1Iwsu0mKuH1VcYH7 P19z+aXlYKGemf31iIdzjMSrCnG8xJhutqyOVYGhiJU/MP93Ntm1qdUw0dv5eqkN41FQ/f POAkU1u2MK4wus4OPbI4mzIWotmzbfSHqz8Vq6UBaKaHKTQwuesL2mhnNuJx1A== 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 4bJM7M1LPTzd2w; Fri, 13 Jun 2025 01:21:51 +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 55D1LpP3087643; Fri, 13 Jun 2025 01:21:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55D1LpJH087629; Fri, 13 Jun 2025 01:21:51 GMT (envelope-from git) Date: Fri, 13 Jun 2025 01:21:51 GMT Message-Id: <202506130121.55D1LpJH087629@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 754bc3dcd3c4 - main - bsdinstall: fix ps3 regression 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 754bc3dcd3c42c0342978eb9fb5143b6fce2b33c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=754bc3dcd3c42c0342978eb9fb5143b6fce2b33c commit 754bc3dcd3c42c0342978eb9fb5143b6fce2b33c Author: Chattrapat Sangmanee AuthorDate: 2025-02-07 21:31:56 +0000 Commit: Warner Losh 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 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