From fcdb04c11c075371f6d8679170919489c581ab36 Mon Sep 17 00:00:00 2001 From: Robbie Harwood Date: Fri, 27 Jan 2023 20:52:00 +0000 Subject: [PATCH] Fix grub-probe isuses in previous commit Resolves: #2143420 Signed-off-by: Robbie Harwood --- 0308-ppc64le-signed-boot-media-changes.patch | 6 +++--- grub2.spec | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/0308-ppc64le-signed-boot-media-changes.patch b/0308-ppc64le-signed-boot-media-changes.patch index c1fbd94..04fd244 100644 --- a/0308-ppc64le-signed-boot-media-changes.patch +++ b/0308-ppc64le-signed-boot-media-changes.patch @@ -41,7 +41,7 @@ Fix detection of root. Try the chrp path as a fallback if the built prefix doesn't work. Signed-off-by: Robbie Harwood -(cherry picked from commit 178d2c473ba6408529d522cd27626e832834590a) +(cherry picked from commit dbdc69060a60988dd72a2df0fd5d0b23ac13e009) --- grub-core/disk/diskfilter.c | 6 ++++++ grub-core/kern/ieee1275/openfw.c | 2 +- @@ -49,14 +49,14 @@ Signed-off-by: Robbie Harwood 3 files changed, 12 insertions(+), 1 deletion(-) 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 +++ b/grub-core/disk/diskfilter.c @@ -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); #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); + return 0; diff --git a/grub2.spec b/grub2.spec index 5816672..51b2de1 100644 --- a/grub2.spec +++ b/grub2.spec @@ -14,7 +14,7 @@ Name: grub2 Epoch: 1 Version: 2.06 -Release: 54%{?dist} +Release: 55%{?dist} Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -532,6 +532,10 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %endif %changelog +* Fri Jan 27 2023 Robbie Harwood - 2.06-55 +- Fix grub-probe isuses in previous commit +- Resolves: #2143420 + * Fri Jan 27 2023 Robbie Harwood - 2.06-54 - ppc64le: update signed media fixes - Resolves: #2143420