rpms
/
grub2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix grub-probe isuses in previous commit 

Resolves: #2143420
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
This commit is contained in:
Robbie Harwood 2023-01-27 20:52:00 +00:00
parent 9c7afa3d14
commit fcdb04c11c
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
0308-ppc64le-signed-boot-media-changes.patch
View File

@ -41,7 +41,7 @@ Fix detection of root.
Try the chrp path as a fallback if the built prefix doesn't work. Try the chrp path as a fallback if the built prefix doesn't work.
Signed-off-by: Robbie Harwood <rharwood@redhat.com> Signed-off-by: Robbie Harwood <rharwood@redhat.com>
(cherry picked from commit 178d2c473ba6408529d522cd27626e832834590a) (cherry picked from commit dbdc69060a60988dd72a2df0fd5d0b23ac13e009)
--- ---
grub-core/disk/diskfilter.c | 6 ++++++ grub-core/disk/diskfilter.c | 6 ++++++
grub-core/kern/ieee1275/openfw.c | 2 +- grub-core/kern/ieee1275/openfw.c | 2 +-
@ -49,14 +49,14 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
3 files changed, 12 insertions(+), 1 deletion(-) 3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/grub-core/disk/diskfilter.c b/grub-core/disk/diskfilter.c diff --git a/grub-core/disk/diskfilter.c b/grub-core/disk/diskfilter.c
index 7cdffe3ebd..27fbca903f 100644 index 7cdffe3ebd..68c836fc64 100644
--- a/grub-core/disk/diskfilter.c --- a/grub-core/disk/diskfilter.c
+++ b/grub-core/disk/diskfilter.c +++ b/grub-core/disk/diskfilter.c
@@ -139,6 +139,12 @@ scan_disk_partition_iter (grub_disk_t disk, grub_partition_t p, void *data) @@ -139,6 +139,12 @@ scan_disk_partition_iter (grub_disk_t disk, grub_partition_t p, void *data)
grub_util_info ("Scanning for DISKFILTER devices on disk %s", name); grub_util_info ("Scanning for DISKFILTER devices on disk %s", name);
#endif #endif
+ if (p->parent == NULL || p->parent->len == 0) + if (p != NULL && (p->parent == NULL || p->parent->len == 0))
+ { + {
+ grub_dprintf ("diskfilter", "skipping %s due to unknown parent partition length", name); + grub_dprintf ("diskfilter", "skipping %s due to unknown parent partition length", name);
+ return 0; + return 0;

6
grub2.spec
View File

@ -14,7 +14,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 2.06 Version: 2.06
Release: 54%{?dist} Release: 55%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more Summary: Bootloader with support for Linux, Multiboot and more
License: GPLv3+ License: GPLv3+
URL: http://www.gnu.org/software/grub/ URL: http://www.gnu.org/software/grub/
@ -532,6 +532,10 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
%endif %endif
%changelog %changelog
* Fri Jan 27 2023 Robbie Harwood <rharwood@redhat.com> - 2.06-55
- Fix grub-probe isuses in previous commit
- Resolves: #2143420
* Fri Jan 27 2023 Robbie Harwood <rharwood@redhat.com> - 2.06-54 * Fri Jan 27 2023 Robbie Harwood <rharwood@redhat.com> - 2.06-54
- ppc64le: update signed media fixes - ppc64le: update signed media fixes
- Resolves: #2143420 - Resolves: #2143420