|
 |
8631a2 |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
8631a2 |
From: Peter Jones <pjones@redhat.com>
|
|
|
8631a2 |
Date: Tue, 18 Feb 2014 09:37:49 -0500
|
|
|
8631a2 |
Subject: [PATCH] Don't emit "Booting ..." message.
|
|
|
8631a2 |
|
|
|
8631a2 |
UI team still hates this stuff, so we're disabling it for RHEL 7.
|
|
|
8631a2 |
|
|
|
8631a2 |
Resolves: rhbz#1023142
|
|
|
8631a2 |
|
|
|
8631a2 |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
8631a2 |
---
|
|
|
8631a2 |
grub-core/normal/menu.c | 4 +++-
|
|
|
8631a2 |
grub-core/normal/menu_entry.c | 3 ---
|
|
|
8631a2 |
2 files changed, 3 insertions(+), 4 deletions(-)
|
|
|
8631a2 |
|
|
|
8631a2 |
diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
|
|
|
030dc3 |
index d2f64b05e0a..5e2f5283d3d 100644
|
|
|
8631a2 |
--- a/grub-core/normal/menu.c
|
|
|
8631a2 |
+++ b/grub-core/normal/menu.c
|
|
|
8631a2 |
@@ -838,12 +838,14 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
|
|
|
8631a2 |
|
|
|
8631a2 |
/* Callback invoked immediately before a menu entry is executed. */
|
|
|
8631a2 |
static void
|
|
|
8631a2 |
-notify_booting (grub_menu_entry_t entry,
|
|
|
8631a2 |
+notify_booting (grub_menu_entry_t __attribute__((unused)) entry,
|
|
|
8631a2 |
void *userdata __attribute__((unused)))
|
|
|
8631a2 |
{
|
|
|
8631a2 |
+#if 0
|
|
|
8631a2 |
grub_printf (" ");
|
|
|
8631a2 |
grub_printf_ (N_("Booting `%s'"), entry->title);
|
|
|
8631a2 |
grub_printf ("\n\n");
|
|
|
8631a2 |
+#endif
|
|
|
8631a2 |
}
|
|
|
8631a2 |
|
|
|
8631a2 |
/* Callback invoked when a default menu entry executed because of a timeout
|
|
|
8631a2 |
diff --git a/grub-core/normal/menu_entry.c b/grub-core/normal/menu_entry.c
|
|
|
030dc3 |
index cdf3590a364..5785f67ee1c 100644
|
|
|
8631a2 |
--- a/grub-core/normal/menu_entry.c
|
|
|
8631a2 |
+++ b/grub-core/normal/menu_entry.c
|
|
|
8631a2 |
@@ -1167,9 +1167,6 @@ run (struct screen *screen)
|
|
|
8631a2 |
char *dummy[1] = { NULL };
|
|
|
8631a2 |
|
|
|
8631a2 |
grub_cls ();
|
|
|
8631a2 |
- grub_printf (" ");
|
|
|
8631a2 |
- grub_printf_ (N_("Booting a command list"));
|
|
|
8631a2 |
- grub_printf ("\n\n");
|
|
|
8631a2 |
|
|
|
8631a2 |
errs_before = grub_err_printed_errors;
|
|
|
8631a2 |
|