dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0047-Don-t-emit-Booting-.-message.patch

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