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
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 */
|
||||
}
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user