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

* grub-core/normal/menu.c: Wait if there were errors shown at "boot"

Browse source 
command.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-03-25 10:32:06 +01:00
parent 6a7fb94bfb
commit daae8f9e6d
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-03-25 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/normal/menu.c: Wait if there were errors shown at "boot"
command.
2013-03-25 Vladimir Serbinenko <phcoder@gmail.com> 2013-03-25 Vladimir Serbinenko <phcoder@gmail.com>
Replace the region at 0 from coreboot tables to available in BSD Replace the region at 0 from coreboot tables to available in BSD

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

@ -250,10 +250,15 @@ grub_menu_execute_entry(grub_menu_entry_t entry, int auto_boot)
if (errs_before != grub_err_printed_errors) if (errs_before != grub_err_printed_errors)
grub_wait_after_message (); grub_wait_after_message ();
errs_before = grub_err_printed_errors;
if (grub_errno == GRUB_ERR_NONE && grub_loader_is_loaded ()) if (grub_errno == GRUB_ERR_NONE && grub_loader_is_loaded ())
/* Implicit execution of boot, only if something is loaded. */ /* Implicit execution of boot, only if something is loaded. */
grub_command_execute ("boot", 0, 0); grub_command_execute ("boot", 0, 0);
if (errs_before != grub_err_printed_errors)
grub_wait_after_message ();
if (entry->submenu) if (entry->submenu)
{ {
if (menu && menu->size) if (menu && menu->size)