vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/normal/menu.c (grub_wait_after_message): Add a 10 second

Browse source 
timeout to avoid indefinite boot stalling.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-08-30 01:14:07 +02:00
parent f21db0332f
commit 8920a08d87
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2010-08-30 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/normal/menu.c (grub_wait_after_message): Add a 10 second
timeout to avoid indefinite boot stalling.
2010-08-30 Vladimir Serbinenko <phcoder@gmail.com> 2010-08-30 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/normal/color.c (grub_env_write_color_normal): Fix a warning. * grub-core/normal/color.c (grub_env_write_color_normal): Fix a warning.

13
grub-core/normal/menu.c
View file

@ -43,9 +43,20 @@ grub_err_t (*grub_gfxmenu_try_hook) (int entry, grub_menu_t menu,
void void
grub_wait_after_message (void) grub_wait_after_message (void)
{ {
grub_uint64_t endtime;
grub_xputs ("\n"); grub_xputs ("\n");
grub_printf_ (N_("Press any key to continue...")); grub_printf_ (N_("Press any key to continue..."));
(void) grub_getkey (); grub_refresh ();
endtime = grub_get_time_ms () + 10000;
while (grub_get_time_ms () < endtime)
if (grub_checkkey () >= 0)
{
grub_getkey ();
break;
}
grub_xputs ("\n"); grub_xputs ("\n");
} }