From 7f51331e483b53545d49bf2c049148ee51469ee9 Mon Sep 17 00:00:00 2001
From: Nicolas Frayer <nfrayer@redhat.com>
Date: Tue, 28 May 2024 15:17:32 +0200
Subject: [PATCH] spec: Added more code for the previous CVE fix

---
 .grub2.metadata |  4 ++++
 grub2.spec      | 13 +++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 .grub2.metadata

diff --git a/.grub2.metadata b/.grub2.metadata
new file mode 100644
index 0000000..b1fd706
--- /dev/null
+++ b/.grub2.metadata
@@ -0,0 +1,4 @@
+3b39cb0830367171760ec536cab805abdbe08bc5 unifont-13.0.06.pcf.gz
+cf0b7763c528902da7e8b05cfa248f20c8825ce5 theme.tar.bz2
+c9f93f1e195ec7a5a21d36a13b469788c0b29f0f grub-2.06.tar.xz
+d08376d97163f99ce0d61fce160d6f7667c5c944 gnulib-9f48fb992a3d7e96610c4ce8be969cff2d61a01b.tar.gz
diff --git a/grub2.spec b/grub2.spec
index a2f1d98..9e99079 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -16,7 +16,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.06
-Release:	79%{?dist}
+Release:	80%{?dist}
 Summary:	Bootloader with support for Linux, Multiboot and more
 License:	GPLv3+
 URL:		http://www.gnu.org/software/grub/
@@ -338,9 +338,11 @@ fi
 if test ! -f ${EFI_HOME}/grub.cfg; then
     # there's no config in ESP, create one
     grub2-mkconfig -o ${EFI_HOME}/grub.cfg
+    cp -a ${EFI_HOME}/grub.cfg ${EFI_HOME}/grub.cfg.rpmsave
+    cp -a ${EFI_HOME}/grub.cfg ${GRUB_HOME}/
 fi
 
-if grep -q "configfile" ${EFI_HOME}/grub.cfg; then
+if grep -q "configfile" ${EFI_HOME}/grub.cfg && grep -q "root-dev-only" ${EFI_HOME}/grub.cfg; then
     exit 0 # already unified, nothing to do
 fi
 
@@ -360,8 +362,6 @@ if test -f ${EFI_HOME}/grubenv; then
     mv --force ${EFI_HOME}/grubenv ${GRUB_HOME}/grubenv
 fi
 
-cp -a ${EFI_HOME}/grub.cfg ${EFI_HOME}/grub.cfg.rpmsave
-cp -a ${EFI_HOME}/grub.cfg ${GRUB_HOME}/
 mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
 
 %files common -f grub.lang
@@ -533,6 +533,11 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
 %endif
 
 %changelog
+* Tue May 28 2024 Nicolas Frayer <nfrayer@redhat.com> - 2.06-80
+- Added more code for the previous CVE fix
+- Related: #RHEL-36249
+- Related: #RHEL-36186
+
 * Tue May 28 2024 Nicolas Frayer <nfrayer@redhat.com> - 2.06-79
 - cmd/search: Rework of CVE-2023-4001 fix
 - Resolves: #RHEL-36249