diff options
| author | Michael Osipov <michaelo@FreeBSD.org> | 2026-01-28 09:02:33 +0000 |
|---|---|---|
| committer | Michael Osipov <michaelo@FreeBSD.org> | 2026-01-29 08:44:45 +0000 |
| commit | 56970c3c4b0bc61d972837661a31cc2b9e8e8d7c (patch) | |
| tree | 7577f143e495953567dcf84c1ee09314b8277e04 | |
| parent | 1b2d495a24c36d81b14178a2f898025946bff2d8 (diff) | |
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
| -rw-r--r-- | release/tools/azure.conf | 2 | ||||
| -rw-r--r-- | release/tools/openstack.conf | 2 | ||||
| -rw-r--r-- | stand/efi/loader/main.c | 4 | ||||
| -rw-r--r-- | 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 981e40566a1c..4fa6ba4d924d 100644 --- a/release/tools/azure.conf +++ b/release/tools/azure.conf @@ -59,7 +59,7 @@ autoboot_delay="-1" beastie_disable="YES" loader_logo="none" hw.memtest.tests="0" -console="comconsole efi vidconsole" +console="comconsole,efi,vidconsole" comconsole_speed="115200" boot_multicons="YES" boot_serial="YES" diff --git a/release/tools/openstack.conf b/release/tools/openstack.conf index 9ce65a75c3c5..6cfb02bab9af 100644 --- a/release/tools/openstack.conf +++ b/release/tools/openstack.conf @@ -33,7 +33,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 22dbd10a0f37..7ff2cf188509 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -1316,10 +1316,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 a70b3a253b90..7538c6d4fb3f 100644 --- a/stand/i386/loader/main.c +++ b/stand/i386/loader/main.c @@ -162,9 +162,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) { |