2002-06-30 Yoshinori K. Okuji <okuji@enbug.org>

* stage2/builtins.c [SUPPORT_SERIAL || SUPPORT_HERCULES]
	(terminal_func): Set CURRENT_TERM to each of selected terminals
	before calling grub_printf, and restore CURRENT_TERM after it.
	Reported by Ilguiz Latypov.
	Prepend a carriage return to the prompting message, because it
	is ugly that the same messages fulfill the whole screen.
This commit is contained in:
okuji 2002-06-29 20:48:42 +00:00
parent d53e46f0a9
commit 05202f5eb0
2 changed files with 23 additions and 2 deletions

View file

@ -1,4 +1,13 @@
2002-06-30 Yoshinori K. Okuji <okuji@alien>
2002-06-30 Yoshinori K. Okuji <okuji@enbug.org>
* stage2/builtins.c [SUPPORT_SERIAL || SUPPORT_HERCULES]
(terminal_func): Set CURRENT_TERM to each of selected terminals
before calling grub_printf, and restore CURRENT_TERM after it.
Reported by Ilguiz Latypov.
Prepend a carriage return to the prompting message, because it
is ugly that the same messages fulfill the whole screen.
2002-06-30 Yoshinori K. Okuji <okuji@enbug.org>
* stage2/serial.c [!GRUB_UTIL] (serial_hw_fetch): Fixed the
conditional statement. Reported by Ilguiz Latypov.

View file

@ -4113,7 +4113,19 @@ terminal_func (char *arg, int flags)
if ((time1 = getrtsecs ()) != time2 && time1 != 0xFF)
{
if (! no_message)
grub_printf ("Press any key to continue.\n");
{
/* Need to set CURRENT_TERM to each of selected
terminals. */
for (i = 0; term_table[i].name; i++)
if (term_bitmap & (1 << i))
{
current_term = term_table + i;
grub_printf ("\rPress any key to continue.\n");
}
/* Restore CURRENT_TERM. */
current_term = prev_term;
}
time2 = time1;
if (to > 0)