git: 93fbf353b62c - stable/13 - loader: Prefer comma-separated list of values for "console"

The branch stable/13 has been updated by michaelo:

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

commit 93fbf353b62c02cebd42e08e1ed97225fe526447
Author:     Michael Osipov <michaelo@FreeBSD.org>
AuthorDate: 2026-01-28 09:02:33 +0000
Commit:     Michael Osipov <michaelo@FreeBSD.org>
CommitDate: 2026-02-05 08:55:28 +0000

    loader: Prefer comma-separated list of values for "console"
    
    PR:             292595
    Reviewed by:    imp
    MFC after:      1 week
    Differential Revision:  https://reviews.freebsd.org/D54923
    
    (cherry picked from commit 56970c3c4b0bc61d972837661a31cc2b9e8e8d7c)
---
 release/tools/azure.conf     | 2 +-
 release/tools/openstack.conf | 2 +-
 stand/efi/loader/main.c      | 4 ++--
 stand/i386/loader/main.c     | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/release/tools/azure.conf b/release/tools/azure.conf
index aa284b150c25..5bb4c0839beb 100644
--- a/release/tools/azure.conf
+++ b/release/tools/azure.conf
@@ -19,7 +19,7 @@ vm_extra_pre_umount() {
 	echo 'sshd_enable="YES"' >> ${DESTDIR}/etc/rc.conf
 	echo 'ifconfig_hn0="SYNCDHCP"' >> ${DESTDIR}/etc/rc.conf
 	echo 'waagent_enable="YES"' >> ${DESTDIR}/etc/rc.conf
-	echo 'console="comconsole vidconsole"' >> ${DESTDIR}/boot/loader.conf
+	echo 'console="comconsole,vidconsole"' >> ${DESTDIR}/boot/loader.conf
 	echo 'comconsole_speed="115200"' >> ${DESTDIR}/boot/loader.conf
 
 	rm -f ${DESTDIR}/etc/resolv.conf
diff --git a/release/tools/openstack.conf b/release/tools/openstack.conf
index 4c905fbae4ba..d927c9efcf79 100644
--- a/release/tools/openstack.conf
+++ b/release/tools/openstack.conf
@@ -41,7 +41,7 @@ vm_extra_pre_umount() {
 	echo 'autoboot_delay="-1"' >> ${DESTDIR}/boot/loader.conf
 	echo 'beastie_disable="YES"' >> ${DESTDIR}/boot/loader.conf
 	echo 'boot_multicons="YES"' >> ${DESTDIR}/boot/loader.conf
-	echo 'console="comconsole vidconsole"' >> ${DESTDIR}/boot/loader.conf
+	echo 'console="comconsole,vidconsole"' >> ${DESTDIR}/boot/loader.conf
 	echo 'comconsole_speed="115200"' >> ${DESTDIR}/boot/loader.conf
 
 	# Reboot quickly, Don't wait at the panic screen
diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c
index e8a5b738aef9..0330ab15db9a 100644
--- a/stand/efi/loader/main.c
+++ b/stand/efi/loader/main.c
@@ -1041,10 +1041,10 @@ main(int argc, CHAR16 *argv[])
 				setenv("console", "comconsole", 1);
 				break;
 			case VID_SER_BOTH:
-				setenv("console", "efi comconsole", 1);
+				setenv("console", "efi,comconsole", 1);
 				break;
 			case SER_VID_BOTH:
-				setenv("console", "comconsole efi", 1);
+				setenv("console", "comconsole,efi", 1);
 				break;
 				/* case VIDEO_ONLY can't happen -- it's the first if above */
 			}
diff --git a/stand/i386/loader/main.c b/stand/i386/loader/main.c
index aecc45352ad7..28c1af05dee6 100644
--- a/stand/i386/loader/main.c
+++ b/stand/i386/loader/main.c
@@ -150,9 +150,9 @@ main(void)
 	bi_setboothowto(initial_howto);
 	if (initial_howto & RB_MULTIPLE) {
 		if (initial_howto & RB_SERIAL)
-			setenv("console", "comconsole vidconsole", 1);
+			setenv("console", "comconsole,vidconsole", 1);
 		else
-			setenv("console", "vidconsole comconsole", 1);
+			setenv("console", "vidconsole,comconsole", 1);
 	} else if (initial_howto & RB_SERIAL) {
 		setenv("console", "comconsole", 1);
 	} else if (initial_howto & RB_MUTE) {