diff --git a/SOURCES/0678-Strip-correctly-BLS-files-with-conf-extension.patch b/SOURCES/0678-Strip-correctly-BLS-files-with-conf-extension.patch new file mode 100644 index 0000000..4273d57 --- /dev/null +++ b/SOURCES/0678-Strip-correctly-BLS-files-with-conf-extension.patch @@ -0,0 +1,37 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Leo Sandoval +Date: Wed, 3 Sep 2025 11:51:38 -0600 +Subject: [PATCH] Strip correctly BLS files with conf extension +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Renaud Métrich +Signed-off-by: Leo Sandoval +--- + grub-core/commands/blscfg.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c +index 795a9f9f17..5e2302c4e8 100644 +--- a/grub-core/commands/blscfg.c ++++ b/grub-core/commands/blscfg.c +@@ -417,12 +417,14 @@ static int bls_cmp(const void *p0, const void *p1, void *state) + id1 = grub_strdup(e1->filename); + + l = grub_strlen(id0); +- if (l > 5 && grub_strcmp(id0 + l - 5, ".conf")) +- id0[l-5] = '\0'; ++ if (l > 5) ++ if (!grub_strcmp(id0 + l - 5, ".conf")) ++ id0[l-5] = '\0'; + + l = grub_strlen(id1); +- if (l > 5 && grub_strcmp(id1 + l - 5, ".conf")) +- id1[l-5] = '\0'; ++ if (l > 5) ++ if(!grub_strcmp(id1 + l - 5, ".conf")) ++ id1[l-5] = '\0'; + + r = split_cmp(id0, id1, 1); + diff --git a/SOURCES/99-grub-mkconfig.install b/SOURCES/99-grub-mkconfig.install index 4736367..408cf0c 100755 --- a/SOURCES/99-grub-mkconfig.install +++ b/SOURCES/99-grub-mkconfig.install @@ -16,6 +16,8 @@ if [[ x$GRUB_ENABLE_BLSCFG != xfalse ]]; then if [[ $ARCH = "ppc64" || $ARCH = "ppc64le" ]]; then RUN_MKCONFIG="true" fi +else + RUN_MKCONFIG="true" fi # A traditional grub configuration file needs to be generated only in the case when diff --git a/SOURCES/grub.patches b/SOURCES/grub.patches index a913b39..64d9eb9 100644 --- a/SOURCES/grub.patches +++ b/SOURCES/grub.patches @@ -674,3 +674,4 @@ Patch0674: 0674-fs-xfs-Add-large-extent-counters-incompat-feature-su.patch Patch0675: 0675-fs-xfs-Handle-non-continuous-data-blocks-in-director.patch Patch0676: 0676-fs-xfs-fix-large-extent-counters-incompat-feature-su.patch Patch0677: 0677-fs-ext2-Rework-out-of-bounds-read-for-inline-and-ext.patch +Patch0678: 0678-Strip-correctly-BLS-files-with-conf-extension.patch diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec index 553af5f..c7574b5 100644 --- a/SPECS/grub2.spec +++ b/SPECS/grub2.spec @@ -11,7 +11,7 @@ Name: grub2 Epoch: 1 Version: 2.02 -Release: 167%{?dist}.alma.1 +Release: 169%{?dist}.alma.1 Summary: Bootloader with support for Linux, Multiboot and more Group: System Environment/Base License: GPLv3+ @@ -544,9 +544,17 @@ fi %endif %changelog -* Wed Jun 04 2025 Eduard Abdullin - 1:2.02-167.alma.1 +* Tue Oct 07 2025 Eduard Abdullin - 1:2.02-169.alma.1 - Debrand for AlmaLinux +* Wed Sep 10 2025 Leo Sandoval - 2.02-169 +- Run mkconfig when GRUB_ENABLE_BLSCFG is false +- Resolves: #RHEL-113830 + +* Wed Sep 3 2025 Leo Sandoval - 2.02-168 +- Strip correctly BLS files with conf extension +- Resolves: #RHEL-112099 + * Thu Apr 24 2025 Leo Sandoval - 2.02-167 - 99-grub-mkconfig.install: fix condition allowing correct checks if GRUB_ENABLE_BLSCFG is not present - Resolves: #RHEL-80168