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