Skip rpm mtime verification on likely-vfat filesystems

Signed-off-by: Robbie Harwood <rharwood@redhat.com>
This commit is contained in:
Robbie Harwood 2022-08-15 20:50:19 +00:00
parent 867b41f7d3
commit 89d7a298b6
2 changed files with 8 additions and 5 deletions

View file

@ -615,14 +615,14 @@ ln -s ../boot/grub2/grub.cfg \\\
%defattr(-,root,root,-) \ %defattr(-,root,root,-) \
%config(noreplace) %{_sysconfdir}/grub2.cfg \ %config(noreplace) %{_sysconfdir}/grub2.cfg \
%config(noreplace) %{_sysconfdir}/grub2-efi.cfg \ %config(noreplace) %{_sysconfdir}/grub2-efi.cfg \
%attr(0700,root,root)%{efi_esp_dir}/%{2} \ %attr(0700,root,root) %verify(not mtime) %{efi_esp_dir}/%{2} \
%ifarch %{arm} \ %ifarch %{arm} \
%attr(0700,root,root)%{efi_esp_boot}/BOOTARM.EFI \ %attr(0700,root,root) %verify(not mtime) %{efi_esp_boot}/BOOTARM.EFI \
%endif \ %endif \
%attr(0700,root,root)/boot/grub2/fonts \ %attr(0700,root,root)/boot/grub2/fonts \
%dir %attr(0700,root,root)/boot/loader/entries \ %dir %attr(0700,root,root)/boot/loader/entries \
%ghost %config(noreplace) %attr(0700,root,root)/boot/grub2/grub.cfg \ %ghost %config(noreplace) %attr(0700,root,root)/boot/grub2/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/grub2/grubenv \ %config(noreplace) %verify(not size mode md5 mtime) /boot/grub2/grubenv \
%attr(0644,root,root) %config(noreplace) /etc/dnf/protected.d/grub2-%{1}.conf \ %attr(0644,root,root) %config(noreplace) /etc/dnf/protected.d/grub2-%{1}.conf \
%{expand:%if 0%{?without_efi_modules} \ %{expand:%if 0%{?without_efi_modules} \
@ -640,6 +640,6 @@ ln -s ../boot/grub2/grub.cfg \\\
\ \
%{expand:%%files %{1}-cdboot} \ %{expand:%%files %{1}-cdboot} \
%defattr(-,root,root,-) \ %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/grub2/fonts \ %attr(0700,root,root)/boot/grub2/fonts \
%{nil} %{nil}

View file

@ -17,7 +17,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 2.06 Version: 2.06
Release: 47%{?dist} Release: 48%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more Summary: Bootloader with support for Linux, Multiboot and more
License: GPLv3+ License: GPLv3+
URL: http://www.gnu.org/software/grub/ URL: http://www.gnu.org/software/grub/
@ -530,6 +530,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
%endif %endif
%changelog %changelog
* Mon Aug 15 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-49
- Skip rpm mtime verification on likely-vfat filesystems
* Mon Aug 15 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-48 * Mon Aug 15 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-48
- Use --with-rpm-version - Use --with-rpm-version
- Resolves: #2118390 - Resolves: #2118390