Page MenuHomeFreeBSD
Files F143305631

D54923.id170631.diff
No OneTemporary
Actions

D54923.id170631.diff
View Options

diff --git a/release/tools/azure.conf b/release/tools/azure.conf
--- a/release/tools/azure.conf
+++ b/release/tools/azure.conf
@@ -59,7 +59,7 @@
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
--- a/release/tools/openstack.conf
+++ b/release/tools/openstack.conf
@@ -33,7 +33,7 @@
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
--- a/stand/efi/loader/main.c
+++ b/stand/efi/loader/main.c
@@ -1316,10 +1316,10 @@
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
--- a/stand/i386/loader/main.c
+++ b/stand/i386/loader/main.c
@@ -162,9 +162,9 @@
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) {

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 29, 4:51 PM (11 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28085307
Default Alt Text
D54923.id170631.diff (2 KB)

Event Timeline