From f8f88e12359e2f459bbf2661df537122e2c79526 Mon Sep 17 00:00:00 2001 From: Robbie Harwood Date: Fri, 27 Jan 2023 20:42:56 +0000 Subject: [PATCH] Fix grub2-probe issue with previous commit Resolves: #2165136 Signed-off-by: Robbie Harwood --- 0318-ppc64le-signed-boot-media-changes.patch | 4 ++-- grub2.spec | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/0318-ppc64le-signed-boot-media-changes.patch b/0318-ppc64le-signed-boot-media-changes.patch index 835f7c9..d6ab961 100644 --- a/0318-ppc64le-signed-boot-media-changes.patch +++ b/0318-ppc64le-signed-boot-media-changes.patch @@ -48,14 +48,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 9ec503d..f6ce92a 100644 --- a/grub2.spec +++ b/grub2.spec @@ -17,7 +17,7 @@ Name: grub2 Epoch: 1 Version: 2.06 -Release: 77%{?dist} +Release: 78%{?dist} Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -544,6 +544,10 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %endif %changelog +* Fri Jan 27 2023 Robbie Harwood - 2.06-78 +- Fix grub2-probe issue with previous commit +- Resolves: #2165136 + * Fri Jan 27 2023 Robbie Harwood - 2.06-77 - ppc64le: update signed media fixes