From d449759abf501566f34920db903152a7a4248ae9 Mon Sep 17 00:00:00 2001
From: Robbie Harwood <rharwood@redhat.com>
Date: Mon, 15 Aug 2022 21:04:30 +0000
Subject: [PATCH] Skip rpm mtime verification on likely-vfat filesystems

Resolves: #2047979
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
---
 grub.macros | 8 ++++----
 grub2.spec  | 6 +++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/grub.macros b/grub.macros
index 6036760..62ed7b6 100755
--- a/grub.macros
+++ b/grub.macros
@@ -622,14 +622,14 @@ ln -s ../boot/%{name}/grub.cfg					\\\
 %defattr(-,root,root,-)						\
 %config(noreplace) %{_sysconfdir}/%{name}.cfg			\
 %config(noreplace) %{_sysconfdir}/%{name}-efi.cfg		\
-%attr(0700,root,root)%{efi_esp_dir}/%{2}			\
+%attr(0700,root,root) %verify(not mtime) %{efi_esp_dir}/%{2}	\
 %ifarch %{arm}							\
-%attr(0700,root,root)%{efi_esp_boot}/BOOTARM.EFI		\
+%attr(0700,root,root) %verify(not mtime) %{efi_esp_boot}/BOOTARM.EFI \
 %endif								\
 %attr(0700,root,root)/boot/%{name}/fonts			\
 %dir %attr(0700,root,root)/boot/loader/entries			\
 %ghost %config(noreplace) %attr(0700,root,root)/boot/%{name}/grub.cfg	\
-%ghost %config(noreplace) %attr(0700,root,root)%{efi_esp_dir}/grub.cfg	\
+%ghost %config(noreplace) %verify(not mtime) %attr(0700,root,root)%{efi_esp_dir}/grub.cfg	\
 %config(noreplace) %verify(not size mode md5 mtime) /boot/%{name}/grubenv	\
 %attr(0644,root,root) %config(noreplace) /etc/dnf/protected.d/%{name}-%{1}.conf \
 %{expand:%if 0%{?without_efi_modules}				\
@@ -647,6 +647,6 @@ ln -s ../boot/%{name}/grub.cfg					\\\
 								\
 %{expand:%%files %{1}-cdboot}					\
 %defattr(-,root,root,-)						\
-%attr(0700,root,root)%{efi_esp_dir}/%{3}			\
+%attr(0700,root,root) %verify(not mtime) %{efi_esp_dir}/%{3}	\
 %attr(0700,root,root)/boot/%{name}/fonts			\
 %{nil}
diff --git a/grub2.spec b/grub2.spec
index e3e31fb..c6ed41c 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -14,7 +14,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.06
-Release:	43%{?dist}
+Release:	44%{?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
+* Mon Aug 15 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-44
+- Skip rpm mtime verification on likely-vfat filesystems
+- Resolves: #2047979
+
 * Thu Aug 11 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-43
 - Generate BLS snippets during mkconfig
 - Resolves: #1969362