mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 14:32:58 +00:00
7e98da058f
This change reorganizes and cleanups our patches to reduce the patch number from 314 patches to 187. That's achieved by dropping patches that are later reverted and squashing fixes for earlier patches that introduced features. There are no code changes and the diff with upstream is the same before and after the cleanup. Having fewer patches makes easier to manage the patchset and also will ease to rebase them on top of the latest grub-2.04 release. Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
78 lines
2.3 KiB
Diff
78 lines
2.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
|
|
Date: Wed, 19 Sep 2012 21:22:55 -0300
|
|
Subject: [PATCH] Add fw_path variable (revised)
|
|
|
|
This patch makes grub look for its config file on efi where the app was
|
|
found. It was originally written by Matthew Garrett, and adapted to fix the
|
|
"No modules are loaded on grub2 network boot" issue:
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=857936
|
|
---
|
|
grub-core/kern/main.c | 13 ++++++-------
|
|
grub-core/normal/main.c | 25 ++++++++++++++++++++++++-
|
|
2 files changed, 30 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
|
|
index 9cad0c4485c..8ab7794c47b 100644
|
|
--- a/grub-core/kern/main.c
|
|
+++ b/grub-core/kern/main.c
|
|
@@ -127,16 +127,15 @@ grub_set_prefix_and_root (void)
|
|
|
|
grub_machine_get_bootlocation (&fwdevice, &fwpath);
|
|
|
|
- if (fwdevice)
|
|
+ if (fwdevice && fwpath)
|
|
{
|
|
- char *cmdpath;
|
|
+ char *fw_path;
|
|
|
|
- cmdpath = grub_xasprintf ("(%s)%s", fwdevice, fwpath ? : "");
|
|
- if (cmdpath)
|
|
+ fw_path = grub_xasprintf ("(%s)/%s", fwdevice, fwpath);
|
|
+ if (fw_path)
|
|
{
|
|
- grub_env_set ("cmdpath", cmdpath);
|
|
- grub_env_export ("cmdpath");
|
|
- grub_free (cmdpath);
|
|
+ grub_env_set ("fw_path", fw_path);
|
|
+ grub_free (fw_path);
|
|
}
|
|
}
|
|
|
|
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
|
|
index 249e19bc788..759c475c4d9 100644
|
|
--- a/grub-core/normal/main.c
|
|
+++ b/grub-core/normal/main.c
|
|
@@ -338,7 +338,30 @@ 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;
|
|
+ const char *prefix, *fw_path;
|
|
+
|
|
+ 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);
|
|
+ if (file)
|
|
+ {
|
|
+ grub_file_close (file);
|
|
+ grub_enter_normal_mode (config);
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ /* Ignore all errors. */
|
|
+ grub_errno = 0;
|
|
+ }
|
|
+ grub_free (config);
|
|
+ }
|
|
+ }
|
|
|
|
prefix = grub_env_get ("prefix");
|
|
if (prefix)
|