mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 22:35:28 +00:00
ec4acbbd98
- Try to fix things for new compiler madness. I really don't know why gcc decided __attribute__((packed)) on a "typedef struct" should imply __attribute__((align (1))) and that it should have a warning that it does so. The obvious behavior would be to keep the alignment of the first element unless it's used in another object or type that /also/ hask the packed attribute. Why should it change the default alignment at all? - Merge in the BLS patches Javier and I wrote. - Attempt to fix pmtimer initialization failures to not be super duper slow. Signed-off-by: Peter Jones <pjones@redhat.com>
52 lines
1.6 KiB
Diff
52 lines
1.6 KiB
Diff
From a72d4819fb7275cbf65b5de901c50d076bf861fd Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Tue, 18 Feb 2014 09:37:49 -0500
|
|
Subject: [PATCH 110/206] 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;
|
|
|
|
--
|
|
2.15.0
|
|
|