7e98da058f
This change reorganizes and cleanups our patches to reduce the patch number from 314 patches to 187. That's achieved by dropping patches that are later reverted and squashing fixes for earlier patches that introduced features. There are no code changes and the diff with upstream is the same before and after the cleanup. Having fewer patches makes easier to manage the patchset and also will ease to rebase them on top of the latest grub-2.04 release. Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
50 lines
1.5 KiB
Diff
50 lines
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Tue, 18 Feb 2014 09:37:49 -0500
|
|
Subject: [PATCH] Don't emit "Booting ..." message.
|
|
|
|
UI team still hates this stuff, so we're disabling it for RHEL 7.
|
|
|
|
Resolves: rhbz#1023142
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
grub-core/normal/menu.c | 4 +++-
|
|
grub-core/normal/menu_entry.c | 3 ---
|
|
2 files changed, 3 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
|
|
index d2f64b05e0a..5e2f5283d3d 100644
|
|
--- a/grub-core/normal/menu.c
|
|
+++ b/grub-core/normal/menu.c
|
|
@@ -838,12 +838,14 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
|
|
|
|
/* Callback invoked immediately before a menu entry is executed. */
|
|
static void
|
|
-notify_booting (grub_menu_entry_t entry,
|
|
+notify_booting (grub_menu_entry_t __attribute__((unused)) entry,
|
|
void *userdata __attribute__((unused)))
|
|
{
|
|
+#if 0
|
|
grub_printf (" ");
|
|
grub_printf_ (N_("Booting `%s'"), entry->title);
|
|
grub_printf ("\n\n");
|
|
+#endif
|
|
}
|
|
|
|
/* Callback invoked when a default menu entry executed because of a timeout
|
|
diff --git a/grub-core/normal/menu_entry.c b/grub-core/normal/menu_entry.c
|
|
index cdf3590a364..5785f67ee1c 100644
|
|
--- a/grub-core/normal/menu_entry.c
|
|
+++ b/grub-core/normal/menu_entry.c
|
|
@@ -1167,9 +1167,6 @@ run (struct screen *screen)
|
|
char *dummy[1] = { NULL };
|
|
|
|
grub_cls ();
|
|
- grub_printf (" ");
|
|
- grub_printf_ (N_("Booting a command list"));
|
|
- grub_printf ("\n\n");
|
|
|
|
errs_before = grub_err_printed_errors;
|
|
|