From 5c4529ecac2526c65e25a09e17c25e18818a438a Mon Sep 17 00:00:00 2001
From: Nicolas Frayer <nfrayer@redhat.com>
Date: Thu, 31 Aug 2023 15:05:19 +0200
Subject: [PATCH] spec: Modified posttrans to harden grub config detection

Resolves: #2235692
Signed-off-by: Nicolas Frayer <nfrayer@redhat.com>
---
 grub2.spec | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/grub2.spec b/grub2.spec
index 3d20581..162769e 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -17,7 +17,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.06
-Release:	97%{?dist}
+Release:	98%{?dist}
 Summary:	Bootloader with support for Linux, Multiboot and more
 License:	GPLv3+
 URL:		http://www.gnu.org/software/grub/
@@ -348,8 +348,8 @@ if test ! -f ${EFI_HOME}/grub.cfg; then
     grub2-mkconfig -o ${EFI_HOME}/grub.cfg
 fi
 
-if grep -q "configfile" ${EFI_HOME}/grub.cfg; then
-    exit 0 # already unified, nothing to do
+if ((grep -q "configfile" ${EFI_HOME}/grub.cfg || grep -q "source" ${EFI_HOME}/grub.cfg) && ! grep -q "# It is automatically generated by grub2-mkconfig using templates" ${EFI_HOME}/grub.cfg); then
+    exit 0 #Already unified
 fi
 
 # create a stub grub2 config in EFI
@@ -544,6 +544,10 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
 %endif
 
 %changelog
+* Thu Aug 31 2023 Nicolas Frayer <nfrayer@redhat.com> - 2.06-98
+- spec: Modified posttrans to harden grub config detection
+- Resolves: #2235692
+
 * Tue Aug 22 2023 Nicolas Frayer <nfrayer@redhat.com> - 2.06-97
 - efi/http: change uint32_t to uintn_t