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>
24 lines
878 B
Diff
24 lines
878 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Thu, 9 Nov 2017 15:58:52 -0500
|
|
Subject: [PATCH] normal: don't draw our startup message if debug is set
|
|
|
|
---
|
|
grub-core/normal/main.c | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
|
|
index 2fe6743399d..f7ee912e715 100644
|
|
--- a/grub-core/normal/main.c
|
|
+++ b/grub-core/normal/main.c
|
|
@@ -425,6 +425,9 @@ grub_normal_reader_init (int nested)
|
|
const char *msg_esc = _("ESC at any time exits.");
|
|
char *msg_formatted;
|
|
|
|
+ if (grub_env_get ("debug") != NULL)
|
|
+ return 0;
|
|
+
|
|
msg_formatted = grub_xasprintf (_("Minimal BASH-like line editing is supported. For "
|
|
"the first word, TAB lists possible command completions. Anywhere "
|
|
"else TAB lists possible device or file completions. %s"),
|