|
 |
f96e0b |
From f6301725f6a55b194640ed2ebf7c182b2cb079ed Mon Sep 17 00:00:00 2001
|
|
|
f96e0b |
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
|
|
f96e0b |
Date: Mon, 25 Mar 2013 10:32:06 +0100
|
|
|
f96e0b |
Subject: [PATCH 233/482] * grub-core/normal/menu.c: Wait if there were
|
|
|
f96e0b |
errors shown at "boot" command.
|
|
|
f96e0b |
|
|
|
f96e0b |
---
|
|
|
f96e0b |
ChangeLog | 5 +++++
|
|
|
f96e0b |
grub-core/normal/menu.c | 5 +++++
|
|
|
f96e0b |
2 files changed, 10 insertions(+)
|
|
|
f96e0b |
|
|
|
f96e0b |
diff --git a/ChangeLog b/ChangeLog
|
|
|
f96e0b |
index 8425aff..5ca62d0 100644
|
|
|
f96e0b |
--- a/ChangeLog
|
|
|
f96e0b |
+++ b/ChangeLog
|
|
|
f96e0b |
@@ -1,5 +1,10 @@
|
|
|
f96e0b |
2013-03-25 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
f96e0b |
|
|
|
f96e0b |
+ * grub-core/normal/menu.c: Wait if there were errors shown at "boot"
|
|
|
f96e0b |
+ command.
|
|
|
f96e0b |
+
|
|
|
f96e0b |
+2013-03-25 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
f96e0b |
+
|
|
|
f96e0b |
Replace the region at 0 from coreboot tables to available in BSD
|
|
|
f96e0b |
memory map.
|
|
|
f96e0b |
|
|
|
f96e0b |
diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
|
|
|
f96e0b |
index 7e0a158..787b287 100644
|
|
|
f96e0b |
--- a/grub-core/normal/menu.c
|
|
|
f96e0b |
+++ b/grub-core/normal/menu.c
|
|
|
f96e0b |
@@ -250,10 +250,15 @@ grub_menu_execute_entry(grub_menu_entry_t entry, int auto_boot)
|
|
|
f96e0b |
if (errs_before != grub_err_printed_errors)
|
|
|
f96e0b |
grub_wait_after_message ();
|
|
|
f96e0b |
|
|
|
f96e0b |
+ errs_before = grub_err_printed_errors;
|
|
|
f96e0b |
+
|
|
|
f96e0b |
if (grub_errno == GRUB_ERR_NONE && grub_loader_is_loaded ())
|
|
|
f96e0b |
/* Implicit execution of boot, only if something is loaded. */
|
|
|
f96e0b |
grub_command_execute ("boot", 0, 0);
|
|
|
f96e0b |
|
|
|
f96e0b |
+ if (errs_before != grub_err_printed_errors)
|
|
|
f96e0b |
+ grub_wait_after_message ();
|
|
|
f96e0b |
+
|
|
|
f96e0b |
if (entry->submenu)
|
|
|
f96e0b |
{
|
|
|
f96e0b |
if (menu && menu->size)
|
|
|
f96e0b |
--
|
|
|
f96e0b |
1.8.2.1
|
|
|
f96e0b |
|