mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-27 23:34:51 +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>
41 lines
1.6 KiB
Diff
41 lines
1.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Fedora Ninjas <grub2-owner@fedoraproject.org>
|
|
Date: Wed, 19 Feb 2014 15:58:43 -0500
|
|
Subject: [PATCH] use fw_path prefix when fallback searching for grub config
|
|
|
|
When PXE booting via UEFI firmware, grub was searching for grub.cfg
|
|
in the fw_path directory where the grub application was found. If
|
|
that didn't exist, a fallback search would look for config file names
|
|
based on MAC and IP address. However, the search would look in the
|
|
prefix directory which may not be the same fw_path. This patch
|
|
changes that behavior to use the fw_path directory for the fallback
|
|
search. Only if fw_path is NULL will the prefix directory be searched.
|
|
|
|
Signed-off-by: Mark Salter <msalter@redhat.com>
|
|
---
|
|
grub-core/normal/main.c | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
|
|
index 7f61c5b618b..8add30e605f 100644
|
|
--- a/grub-core/normal/main.c
|
|
+++ b/grub-core/normal/main.c
|
|
@@ -349,7 +349,7 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
|
|
char *config;
|
|
const char *prefix, *fw_path;
|
|
|
|
- fw_path = grub_env_get ("fw_path");
|
|
+ prefix = fw_path = grub_env_get ("fw_path");
|
|
if (fw_path)
|
|
{
|
|
config = grub_xasprintf ("%s/grub.cfg", fw_path);
|
|
@@ -372,7 +372,8 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
|
|
}
|
|
}
|
|
|
|
- prefix = grub_env_get ("prefix");
|
|
+ if (! prefix)
|
|
+ prefix = grub_env_get ("prefix");
|
|
if (prefix)
|
|
{
|
|
grub_size_t config_len;
|