The branch main has been updated by jrtc27:
URL:
https://cgit.FreeBSD.org/src/commit/?id=2a90c47af158625b3e28390801639c21d6d0ed2a
commit 2a90c47af158625b3e28390801639c21d6d0ed2a
Author: Jessica Clarke <jrt...@freebsd.org>
AuthorDate: 2022-09-02 19:30:50 +0000
Commit: Jessica Clarke <jrt...@freebsd.org>
CommitDate: 2022-09-02 19:30:50 +0000
release: Set loader_menu_multi_user_prompt to "Installer" for installer
This makes it more obvious that the media being booted is an installer
rather than an installed system, which is otherwise hard to distinguish.
It also provides a more user-friendly, and more accurate, prompt.
Reviewed by: gjb
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D36419
---
release/Makefile | 3 +++
1 file changed, 3 insertions(+)
diff --git a/release/Makefile b/release/Makefile
index 7aeca8cc0276..16fae5d74acb 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -187,6 +187,7 @@ disc1: packagesystem
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_menu_multi_user_prompt=\"Installer\" >>
${.TARGET}/boot/loader.conf
cp ${.CURDIR}/rc.local ${.TARGET}/etc
.if defined(NO_ROOT)
echo "./etc/resolv.conf type=link uname=root gname=wheel mode=0644
link=/tmp/bsdinstall_etc/resolv.conf" >> ${.TARGET}/METALOG
@@ -222,6 +223,7 @@ bootonly: packagesystem
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_menu_multi_user_prompt=\"Installer\" >>
${.TARGET}/boot/loader.conf
cp ${.CURDIR}/rc.local ${.TARGET}/etc
.if defined(NO_ROOT)
echo "./etc/resolv.conf type=link uname=root gname=wheel mode=0644
link=/tmp/bsdinstall_etc/resolv.conf" >> ${.TARGET}/METALOG
@@ -256,6 +258,7 @@ dvd: packagesystem
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_menu_multi_user_prompt=\"Installer\" >>
${.TARGET}/boot/loader.conf
cp ${.CURDIR}/rc.local ${.TARGET}/etc
.if defined(NO_ROOT)
echo "./etc/resolv.conf type=link uname=root gname=wheel mode=0644
link=/tmp/bsdinstall_etc/resolv.conf" >> ${.TARGET}/METALOG
