git: a09af1b7fd95 - main - bsdinstall release: Start installer on multiple consoles

The branch main has been updated by jrtc27:

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

commit a09af1b7fd95d9479954c5b8e96a126cad468424
Author:     Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2022-10-03 16:09:17 +0000
Commit:     Jessica Clarke <jrtc27@FreeBSD.org>
CommitDate: 2022-10-03 16:09:17 +0000

    bsdinstall release: Start installer on multiple consoles
    
    Currently the installer is only started on the primary ("high level")
    console. For systems where this is the video console and serial consoles
    aren't of interest, and headless systems with just a serial console,
    this works just fine, but for systems where both video and serial
    consoles are present and meaningful this requires the user to select the
    right primary console in loader, with the poor user experience of the
    system appearing to hang if they leave the wrong one selected. This
    notably differs from our multi-user behaviour of spawning getty on every
    console, where the only issue with selecting the wrong primary console
    is a quieter boot process until the login prompt appears (or the system
    crashes).
    
    Instead, use the newly-added runconsoles helper to run the installer on
    every console (except for ttyv*, where only ttyv0 will be used). For
    interactive installations, any of the consoles can be used, though only
    one should be used at a time as no effort is made to avoid multiple
    installations running at the same time clobbering each other. If the
    Live CD option is selected, the other installers (which should, if the
    user is well-behaved, be sitting at the welcome screen) will be killed.
    If an automated install is in use, the primary console will be used to
    display its output, and the others will direct the user to the primary
    console.
    
    Reviewed by:    brooks, gjb
    Differential Revision:  https://reviews.freebsd.org/D36805
---
 release/rc.local                    | 54 +++++++++++++++++++++++++++++++++++--
 usr.sbin/bsdinstall/startbsdinstall |  5 +++-
 2 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/release/rc.local b/release/rc.local
index 943c175ddd52..a2c1676313c5 100755
--- a/release/rc.local
+++ b/release/rc.local
@@ -1,7 +1,57 @@
 #!/bin/sh
-# $FreeBSD$
+#
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2022 Jessica Clarke <jrtc27@FreeBSD.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+bsdinstall_multicons_disabled()
+{
+	local var value
+
+	var=bsdinstall.multicons_disable
+	value=`kenv -q $var`
+	case "${value:-NO}" in
+	[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
+		return 0
+		;;
+	[Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
+		return 1
+		;;
+	*)
+		warn "$var is not set properly, ignoring"
+		return 1
+		;;
+	esac
+}
 
 # resolv.conf from DHCP ends up in here, so make sure the directory exists
 mkdir /tmp/bsdinstall_etc
 
-/usr/libexec/bsdinstall/startbsdinstall
+if bsdinstall_multicons_disabled; then
+	/usr/libexec/bsdinstall/startbsdinstall primary
+else
+	echo
+	/usr/libexec/bsdinstall/runconsoles /usr/libexec/bsdinstall/startbsdinstall %
+fi
diff --git a/usr.sbin/bsdinstall/startbsdinstall b/usr.sbin/bsdinstall/startbsdinstall
index 3a5a07e85b4d..0a8207df9bd8 100644
--- a/usr.sbin/bsdinstall/startbsdinstall
+++ b/usr.sbin/bsdinstall/startbsdinstall
@@ -45,7 +45,10 @@ export TERM
 resizewin -z
 
 if [ -f /etc/installerconfig ]; then
-	if bsdinstall script /etc/installerconfig; then
+	if [ "$1" != "primary" ]; then
+		bsddialog --backtitle "FreeBSD Installer" --title "Installing" --msgbox "FreeBSD is being installed from a script; please use the primary console." 0 0
+		. "$0"
+	elif bsdinstall script /etc/installerconfig; then
 		bsddialog --backtitle "FreeBSD Installer" --title "Complete" --no-cancel --ok-label "Reboot" --pause "Installation of FreeBSD complete! Rebooting in 10 seconds" 10 30 10
 		reboot
 	else