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>
114 lines
3.4 KiB
Diff
114 lines
3.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Mon, 8 Jul 2019 17:33:22 +0200
|
|
Subject: [PATCH] Try mac/guid/etc before grub.cfg on tftp config files.
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
grub-core/normal/main.c | 84 ++++++++++++++++++++++++++-----------------------
|
|
1 file changed, 45 insertions(+), 39 deletions(-)
|
|
|
|
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
|
|
index 8add30e605f..d93bee613ac 100644
|
|
--- a/grub-core/normal/main.c
|
|
+++ b/grub-core/normal/main.c
|
|
@@ -347,53 +347,59 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
|
|
/* Guess the config filename. It is necessary to make CONFIG static,
|
|
so that it won't get broken by longjmp. */
|
|
char *config;
|
|
- const char *prefix, *fw_path;
|
|
-
|
|
- prefix = fw_path = grub_env_get ("fw_path");
|
|
- if (fw_path)
|
|
- {
|
|
- config = grub_xasprintf ("%s/grub.cfg", fw_path);
|
|
- if (config)
|
|
- {
|
|
- grub_file_t file;
|
|
-
|
|
- file = grub_file_open (config, GRUB_FILE_TYPE_CONFIG);
|
|
- if (file)
|
|
- {
|
|
- grub_file_close (file);
|
|
- grub_enter_normal_mode (config);
|
|
- }
|
|
- else
|
|
- {
|
|
- /* Ignore all errors. */
|
|
- grub_errno = 0;
|
|
- }
|
|
- grub_free (config);
|
|
- }
|
|
- }
|
|
+ const char *prefix;
|
|
|
|
+ prefix = grub_env_get ("fw_path");
|
|
if (! prefix)
|
|
prefix = grub_env_get ("prefix");
|
|
+
|
|
if (prefix)
|
|
{
|
|
- grub_size_t config_len;
|
|
- config_len = grub_strlen (prefix) +
|
|
- sizeof ("/grub.cfg-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX");
|
|
- config = grub_malloc (config_len);
|
|
-
|
|
- if (! config)
|
|
- goto quit;
|
|
-
|
|
- grub_snprintf (config, config_len, "%s/grub.cfg", prefix);
|
|
-
|
|
if (grub_strncmp (prefix + 1, "tftp", sizeof ("tftp") - 1) == 0)
|
|
- grub_net_search_configfile (config);
|
|
+ {
|
|
+ grub_size_t config_len;
|
|
+ config_len = grub_strlen (prefix) +
|
|
+ sizeof ("/grub.cfg-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX");
|
|
+ config = grub_malloc (config_len);
|
|
|
|
- grub_enter_normal_mode (config);
|
|
- grub_free (config);
|
|
- }
|
|
+ if (! config)
|
|
+ goto quit;
|
|
+
|
|
+ grub_snprintf (config, config_len, "%s/grub.cfg", prefix);
|
|
+
|
|
+ grub_net_search_configfile (config);
|
|
+
|
|
+ grub_enter_normal_mode (config);
|
|
+ grub_free (config);
|
|
+ config = NULL;
|
|
+ }
|
|
+
|
|
+ if (!config)
|
|
+ {
|
|
+ config = grub_xasprintf ("%s/grub.cfg", prefix);
|
|
+ if (config)
|
|
+ {
|
|
+ grub_file_t file;
|
|
+
|
|
+ file = grub_file_open (config, GRUB_FILE_TYPE_CONFIG);
|
|
+ if (file)
|
|
+ {
|
|
+ grub_file_close (file);
|
|
+ grub_enter_normal_mode (config);
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ /* Ignore all errors. */
|
|
+ grub_errno = 0;
|
|
+ }
|
|
+ grub_free (config);
|
|
+ }
|
|
+ }
|
|
+ }
|
|
else
|
|
- grub_enter_normal_mode (0);
|
|
+ {
|
|
+ grub_enter_normal_mode (0);
|
|
+ }
|
|
}
|
|
else
|
|
grub_enter_normal_mode (argv[0]);
|