mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 22:35:28 +00:00
e1531466e1
This change updates grub to the 2.04 release. The new release changed how grub is built, so the bootstrap and bootstrap.conf files have to be added to the dist-git. Also, the gitignore file changed so it has to be updated. Since the patches have been forward ported to 2.04, there's no need for a logic to maintain a patch with the delta between the release and the grub master branch. So the release-to-master.patch is dropped and no longer is updated by the do-rebase script. Also since gnulib isn't part of the grub repository anymore and cloned by the boostrap tool, a gnulib tarball is included as other source file and copied before calling the bootstrap tool. That way grub can be built even in builders that only have access to the sources lookaside cache. Resolves: rhbz#1727279 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
49 lines
1.5 KiB
Diff
49 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 9175ad297d8..783bde55b9e 100644
|
|
--- a/grub-core/normal/menu.c
|
|
+++ b/grub-core/normal/menu.c
|
|
@@ -839,12 +839,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;
|
|
|