mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-28 15:46:53 +00:00
50 lines
1.4 KiB
Diff
50 lines
1.4 KiB
Diff
|
From 55073b6febd54c1dfe6366f9e8a4d945d1eb70ca Mon Sep 17 00:00:00 2001
|
||
|
|
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
||
|
|
Date: Mon, 25 Mar 2013 10:32:06 +0100
|
||
|
|
Subject: [PATCH 232/364] * grub-core/normal/menu.c: Wait if there were
|
||
|
|
errors shown at "boot" command.
|
||
|
|
|
||
|
|
---
|
||
|
|
ChangeLog | 5 +++++
|
||
|
|
grub-core/normal/menu.c | 5 +++++
|
||
|
|
2 files changed, 10 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/ChangeLog b/ChangeLog
|
||
|
|
index 8425aff..5ca62d0 100644
|
||
|
|
--- a/ChangeLog
|
||
|
|
+++ b/ChangeLog
|
||
|
|
@@ -1,5 +1,10 @@
|
||
|
|
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>
|
||
|
|
+
|
||
|
|
Replace the region at 0 from coreboot tables to available in BSD
|
||
|
|
memory map.
|
||
|
|
|
||
|
|
diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
|
||
|
|
index 7e0a158..787b287 100644
|
||
|
|
--- a/grub-core/normal/menu.c
|
||
|
|
+++ b/grub-core/normal/menu.c
|
||
|
|
@@ -250,10 +250,15 @@ grub_menu_execute_entry(grub_menu_entry_t entry, int auto_boot)
|
||
|
|
if (errs_before != grub_err_printed_errors)
|
||
|
|
grub_wait_after_message ();
|
||
|
|
|
||
|
|
+ errs_before = grub_err_printed_errors;
|
||
|
|
+
|
||
|
|
if (grub_errno == GRUB_ERR_NONE && grub_loader_is_loaded ())
|
||
|
|
/* Implicit execution of boot, only if something is loaded. */
|
||
|
|
grub_command_execute ("boot", 0, 0);
|
||
|
|
|
||
|
|
+ if (errs_before != grub_err_printed_errors)
|
||
|
|
+ grub_wait_after_message ();
|
||
|
|
+
|
||
|
|
if (entry->submenu)
|
||
|
|
{
|
||
|
|
if (menu && menu->size)
|
||
|
|
--
|
||
|
|
1.8.1.4
|
||
|
|
|