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