mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 14:32:58 +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>
208 lines
5.7 KiB
Diff
208 lines
5.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Tue, 9 Jul 2019 10:35:16 +0200
|
|
Subject: [PATCH] Try $prefix if $fw_path doesn't work.
|
|
|
|
Related: rhbz#1148652
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
grub-core/kern/ieee1275/init.c | 28 +++++-----
|
|
grub-core/net/net.c | 2 +-
|
|
grub-core/normal/main.c | 120 ++++++++++++++++++++---------------------
|
|
3 files changed, 75 insertions(+), 75 deletions(-)
|
|
|
|
diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
|
|
index e71d1584164..0cd2a627231 100644
|
|
--- a/grub-core/kern/ieee1275/init.c
|
|
+++ b/grub-core/kern/ieee1275/init.c
|
|
@@ -127,23 +127,25 @@ grub_machine_get_bootlocation (char **device, char **path)
|
|
grub_free (canon);
|
|
}
|
|
else
|
|
- *device = grub_ieee1275_encode_devname (bootpath);
|
|
- grub_free (type);
|
|
-
|
|
- filename = grub_ieee1275_get_filename (bootpath);
|
|
- if (filename)
|
|
{
|
|
- char *lastslash = grub_strrchr (filename, '\\');
|
|
-
|
|
- /* Truncate at last directory. */
|
|
- if (lastslash)
|
|
+ filename = grub_ieee1275_get_filename (bootpath);
|
|
+ if (filename)
|
|
{
|
|
- *lastslash = '\0';
|
|
- grub_translate_ieee1275_path (filename);
|
|
+ char *lastslash = grub_strrchr (filename, '\\');
|
|
|
|
- *path = filename;
|
|
- }
|
|
+ /* Truncate at last directory. */
|
|
+ if (lastslash)
|
|
+ {
|
|
+ *lastslash = '\0';
|
|
+ grub_translate_ieee1275_path (filename);
|
|
+
|
|
+ *path = filename;
|
|
+ }
|
|
+ }
|
|
+ *device = grub_ieee1275_encode_devname (bootpath);
|
|
}
|
|
+
|
|
+ grub_free (type);
|
|
grub_free (bootpath);
|
|
}
|
|
|
|
diff --git a/grub-core/net/net.c b/grub-core/net/net.c
|
|
index 06454564b8f..4b7972b8e7e 100644
|
|
--- a/grub-core/net/net.c
|
|
+++ b/grub-core/net/net.c
|
|
@@ -1850,7 +1850,7 @@ grub_net_search_configfile (char *config)
|
|
/* Remove the remaining minus sign at the end. */
|
|
config[config_len] = '\0';
|
|
|
|
- return GRUB_ERR_NONE;
|
|
+ return GRUB_ERR_FILE_NOT_FOUND;
|
|
}
|
|
|
|
static struct grub_preboot *fini_hnd;
|
|
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
|
|
index d93bee613ac..2fe6743399d 100644
|
|
--- a/grub-core/normal/main.c
|
|
+++ b/grub-core/normal/main.c
|
|
@@ -337,74 +337,72 @@ grub_enter_normal_mode (const char *config)
|
|
grub_boot_time ("Exiting normal mode");
|
|
}
|
|
|
|
+static grub_err_t
|
|
+grub_try_normal (const char *variable)
|
|
+{
|
|
+ char *config;
|
|
+ const char *prefix;
|
|
+ grub_err_t err = GRUB_ERR_FILE_NOT_FOUND;
|
|
+
|
|
+ prefix = grub_env_get (variable);
|
|
+ if (!prefix)
|
|
+ return GRUB_ERR_FILE_NOT_FOUND;
|
|
+
|
|
+ if (grub_strncmp (prefix + 1, "tftp", sizeof ("tftp") - 1) == 0)
|
|
+ {
|
|
+ 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)
|
|
+ return GRUB_ERR_FILE_NOT_FOUND;
|
|
+
|
|
+ grub_snprintf (config, config_len, "%s/grub.cfg", prefix);
|
|
+ err = grub_net_search_configfile (config);
|
|
+ }
|
|
+
|
|
+ if (err != GRUB_ERR_NONE)
|
|
+ {
|
|
+ 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);
|
|
+ err = GRUB_ERR_NONE;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
+ if (err == GRUB_ERR_NONE)
|
|
+ grub_enter_normal_mode (config);
|
|
+
|
|
+ grub_errno = 0;
|
|
+ grub_free (config);
|
|
+ return err;
|
|
+}
|
|
+
|
|
/* Enter normal mode from rescue mode. */
|
|
static grub_err_t
|
|
grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
|
|
int argc, char *argv[])
|
|
{
|
|
- if (argc == 0)
|
|
- {
|
|
- /* 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;
|
|
-
|
|
- prefix = grub_env_get ("fw_path");
|
|
- if (! prefix)
|
|
- prefix = grub_env_get ("prefix");
|
|
-
|
|
- if (prefix)
|
|
- {
|
|
- if (grub_strncmp (prefix + 1, "tftp", sizeof ("tftp") - 1) == 0)
|
|
- {
|
|
- 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);
|
|
-
|
|
- 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);
|
|
- }
|
|
- }
|
|
- else
|
|
+ if (argc)
|
|
grub_enter_normal_mode (argv[0]);
|
|
+ else
|
|
+ {
|
|
+ /* Guess the config filename. */
|
|
+ grub_err_t err;
|
|
+ err = grub_try_normal ("fw_path");
|
|
+ if (err == GRUB_ERR_FILE_NOT_FOUND)
|
|
+ err = grub_try_normal ("prefix");
|
|
+ if (err == GRUB_ERR_FILE_NOT_FOUND)
|
|
+ grub_enter_normal_mode (0);
|
|
+ }
|
|
|
|
-quit:
|
|
return 0;
|
|
}
|
|
|