mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-12-01 08:49:52 +00:00
ec4acbbd98
- Try to fix things for new compiler madness. I really don't know why gcc decided __attribute__((packed)) on a "typedef struct" should imply __attribute__((align (1))) and that it should have a warning that it does so. The obvious behavior would be to keep the alignment of the first element unless it's used in another object or type that /also/ hask the packed attribute. Why should it change the default alignment at all? - Merge in the BLS patches Javier and I wrote. - Attempt to fix pmtimer initialization failures to not be super duper slow. Signed-off-by: Peter Jones <pjones@redhat.com>
81 lines
2.3 KiB
Diff
81 lines
2.3 KiB
Diff
From bcb1f1a6a5530ecbc4b674e61acbb406592714c6 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 082/206] 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)
|
|
--
|
|
2.15.0
|
|
|