rpms/grub2
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

normal: fix prefix when loading modules

Browse Source 
Resolves: #2209435
Resolves: #2173015
Signed-off-by: Nicolas Frayer <nfrayer@redhat.com>
This commit is contained in:
Nicolas Frayer 2023-12-19 17:32:37 +01:00
parent 4562b72afc
commit d11c8385d6
3 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
0348-normal-Remove-grub_env_set-prefix-in-grub_try_normal.patch Normal file
View File

@ -0,0 +1,27 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nicolas Frayer <nfrayer@redhat.com>
Date: Tue, 19 Dec 2023 16:52:05 +0100
Subject: [PATCH] normal: Remove grub_env_set prefix in grub_try_normal_prefix
Commit de735a453aa35 added a grub_env_set where the prefix contains
the arch name in the pathname. This create issues when trying to
load modules using this prefix as the pathname contains a "doubled"
arch name in it (ie .../powerpc-ieee1275/powerpc-ieee1275/).
Signed-off-by: Nicolas Frayer <nfrayer@redhat.com>
---
grub-core/normal/main.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
index d59145f861d5..bac7b8a0e1d8 100644
--- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c
@@ -372,7 +372,6 @@ grub_try_normal_prefix (const char *prefix)
file = grub_file_open (config, GRUB_FILE_TYPE_CONFIG);
if (file)
{
- grub_env_set ("prefix", prefix);
grub_file_close (file);
err = GRUB_ERR_NONE;
}

3
grub.patches
View File

@ -344,4 +344,5 @@ Patch0343: 0343-fs-xfs-Fix-issues-found-while-fuzzing-the-XFS-filesy.patch
Patch0344: 0344-fs-xfs-Incorrect-short-form-directory-data-boundary-.patch
Patch0345: 0345-fs-xfs-Fix-XFS-directory-extent-parsing.patch
Patch0346: 0346-fs-xfs-Add-large-extent-counters-incompat-feature-su.patch
Patch0347: 0347-chainloader-remove-device-path-debug-message.patch
Patch0347: 0347-chainloader-remove-device-path-debug-message.patch
Patch0348: 0348-normal-Remove-grub_env_set-prefix-in-grub_try_normal.patch

7
grub2.spec
View File

@ -17,7 +17,7 @@
Name: grub2
Epoch: 1
Version: 2.06
Release: 111%{?dist}
Release: 112%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more
License: GPL-3.0-or-later
URL: http://www.gnu.org/software/grub/
@ -555,6 +555,11 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
%endif
%changelog
* Tue Dec 19 2023 Nicolas Frayer <nfrayer@redhat.com> - 2.06-112
- normal: fix prefix when loading modules
- Resolves: #2209435
- Resolves: #2173015
* Tue Dec 12 2023 leo sandoval <lsandova@redhat.com> - 2.06-111
- chainloader: remove device path debug message