The branch main has been updated by jrm:
URL:
https://cgit.FreeBSD.org/src/commit/?id=ac7a19d41ee5eb1271c46fbc620b2f98dffa2230
commit ac7a19d41ee5eb1271c46fbc620b2f98dffa2230
Author: Joseph Mingrone <j...@freebsd.org>
AuthorDate: 2025-06-23 20:47:20 +0000
Commit: Joseph Mingrone <j...@freebsd.org>
CommitDate: 2025-06-24 15:11:15 +0000
lualoader: Add distinct brand for installer
Make it obvious to users that the system is booting into the installer.
Reviewed by: kevans, manu
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D51001
---
release/Makefile | 3 +++
stand/images/Makefile | 3 ++-
stand/images/freebsd-install-brand-rev.png | Bin 0 -> 7724 bytes
stand/lua/Makefile | 1 +
stand/lua/gfx-install.lua | 24 ++++++++++++++++++++++++
5 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/release/Makefile b/release/Makefile
index 5875a22a5bfd..d7721cf4ccd8 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -245,6 +245,7 @@ disc1: ${PKGBASE_REPO}
echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf
echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf
+ echo loader_brand=\"install\" >> ${.TARGET}/boot/loader.conf
echo loader_menu_multi_user_prompt=\"Installer\" >>
${.TARGET}/boot/loader.conf
cp ${.CURDIR}/rc.local ${.TARGET}/etc
echo "./etc/resolv.conf type=link uname=root gname=wheel mode=0644
link=/tmp/bsdinstall_etc/resolv.conf" >> ${.TARGET}/METALOG
@@ -284,6 +285,7 @@ bootonly:
echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf
echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf
+ echo loader_brand=\"install\" >> ${.TARGET}/boot/loader.conf
echo loader_menu_multi_user_prompt=\"Installer\" >>
${.TARGET}/boot/loader.conf
cp ${.CURDIR}/rc.local ${.TARGET}/etc
echo "./etc/resolv.conf type=link uname=root gname=wheel mode=0644
link=/tmp/bsdinstall_etc/resolv.conf" >> ${.TARGET}/METALOG
@@ -338,6 +340,7 @@ dvd: ${PKGBASE_REPO}
echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf
echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf
echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
+ echo loader_brand=\"install\" >> ${.TARGET}/boot/loader.conf
echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf
echo loader_menu_multi_user_prompt=\"Installer\" >>
${.TARGET}/boot/loader.conf
cp ${.CURDIR}/rc.local ${.TARGET}/etc
diff --git a/stand/images/Makefile b/stand/images/Makefile
index d1e7d124dfa6..2f45b989e0a7 100644
--- a/stand/images/Makefile
+++ b/stand/images/Makefile
@@ -1,6 +1,7 @@
.include <bsd.init.mk>
-FILES+= freebsd-brand-rev.png freebsd-brand.png freebsd-logo-rev.png
+FILES+= freebsd-brand-rev.png freebsd-brand.png
freebsd-install-brand-rev.png \
+ freebsd-logo-rev.png
FILESDIR= /boot/images
diff --git a/stand/images/freebsd-install-brand-rev.png
b/stand/images/freebsd-install-brand-rev.png
new file mode 100644
index 000000000000..59d173d3f8b3
Binary files /dev/null and b/stand/images/freebsd-install-brand-rev.png differ
diff --git a/stand/lua/Makefile b/stand/lua/Makefile
index 3cec7ae3b050..d319261e18b2 100644
--- a/stand/lua/Makefile
+++ b/stand/lua/Makefile
@@ -24,6 +24,7 @@ FILES= cli.lua \
gfx-beastie.lua \
gfx-beastiebw.lua \
gfx-fbsdbw.lua \
+ gfx-install.lua \
gfx-orb.lua \
gfx-orbbw.lua \
menu.lua \
diff --git a/stand/lua/gfx-install.lua b/stand/lua/gfx-install.lua
new file mode 100644
index 000000000000..d4cd34e32e1e
--- /dev/null
+++ b/stand/lua/gfx-install.lua
@@ -0,0 +1,24 @@
+--
+-- Copyright (c) 2025 Joseph Mingrone <j...@freebsd.org>
+--
+-- SPDX-License-Identifier: BSD-2-Clause
+--
+
+return {
+ brand = {
+ ascii = {
+ image = {
+ " _____ ____ ____ ____ ___
_ _ _",
+ "| ___| __ ___ ___| __ ) ___|| _ \\ |_ _|_ __
___| |_ __ _| | | ___ _ __",
+ "| |_ | '__/ _ \\/ _ \\ _ \\___ \\| | | | | ||
'_ \\/ __| __/ _` | | |/ _ \\ '__|",
+ "| _|| | | __/ __/ |_) |__) | |_| | | || | |
\\__ \\ || (_| | | | __/ |",
+ "|_| |_| \\___|\\___|____/____/|____/ |___|_|
|_|___/\\__\\__,_|_|_|\\___|_|",
+ },
+ requires_color = false,
+ },
+ fb = {
+ image = "/boot/images/freebsd-install-brand-rev.png",
+ width = 80,
+ },
+ }
+}
