diff options
| author | jhb <jhb@FreeBSD.org> | 2005-05-27 19:31:00 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2005-05-27 19:31:00 +0000 |
| commit | 65ffcee053e76ba577b7e36112e113c94a943ade (patch) | |
| tree | 859ee2269f72fa748bba4cbbbbab735220546737 /sys/boot/pc98/loader/main.c | |
| parent | e2d11cf4d44df5cebaebaafbedc7183804582ff5 (diff) | |
| download | FreeBSD-src-65ffcee053e76ba577b7e36112e113c94a943ade.zip FreeBSD-src-65ffcee053e76ba577b7e36112e113c94a943ade.tar.gz | |
- Add support to the loader for multiple consoles.
- Teach the i386 and pc98 loaders to honor multiple console requests from
their respective boot2 binaries so that the same console(s) are used in
both boot2 and the loader.
- Since the kernel doesn't support multiple consoles, whichever console is
listed first is treated as the "primary" console and is passed to the
kernel in the boot_howto flags.
PR: kern/66425
Submitted by: Gavin Atkinson gavin at ury dot york dot ac dot uk
MFC after: 1 week
Diffstat (limited to 'sys/boot/pc98/loader/main.c')
| -rw-r--r-- | sys/boot/pc98/loader/main.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sys/boot/pc98/loader/main.c b/sys/boot/pc98/loader/main.c index 8b472c5..14354f3 100644 --- a/sys/boot/pc98/loader/main.c +++ b/sys/boot/pc98/loader/main.c @@ -98,12 +98,16 @@ main(void) * We can use printf() etc. once this is done. * If the previous boot stage has requested a serial console, prefer that. */ - if (initial_howto & RB_SERIAL) + if (initial_howto & RB_MULTIPLE) { + setenv("boot_multicons", "YES", 1); + if (initial_howto & RB_SERIAL) + setenv("console", "comconsole vidconsole", 1); + else + setenv("console", "vidconsole comconsole", 1); + } else if (initial_howto & RB_SERIAL) setenv("console", "comconsole", 1); - if (initial_howto & RB_MUTE) + else if (initial_howto & RB_MUTE) setenv("console", "nullconsole", 1); - if (initial_howto & RB_MULTIPLE) - setenv("boot_multicons", "YES", 1); cons_probe(); /* |
