mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-27 23:34:51 +00:00
Fix directory/file permissions on /boot/efi/* to match what the filesystem
enforces. Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
parent
087ddf4309
commit
dd51c39736
2 changed files with 13 additions and 9 deletions
14
grub.macros
14
grub.macros
|
@ -488,10 +488,10 @@ touch ${RPM_BUILD_ROOT}/boot/%{name}/grub.cfg \
|
|||
%{expand:%%files %{1}} \
|
||||
%defattr(-,root,root,-) \
|
||||
%config(noreplace) %{_sysconfdir}/%{name}-efi.cfg \
|
||||
%dir %attr(0755,root,root)/boot/efi/EFI/%{efidir} \
|
||||
/boot/efi/EFI/%{efidir}/%{2} \
|
||||
%attr(0755,root,root)/boot/efi/EFI/%{efidir}/fonts \
|
||||
%ghost %config(noreplace) /boot/efi/EFI/%{efidir}/grub.cfg \
|
||||
%dir %attr(0700,root,root)/boot/efi/EFI/%{efidir} \
|
||||
%attr(0700,root,root)/boot/efi/EFI/%{efidir}/%{2} \
|
||||
%attr(0700,root,root)/boot/efi/EFI/%{efidir}/fonts \
|
||||
%attr(0700,root,root) %ghost %config(noreplace) /boot/efi/EFI/%{efidir}/grub.cfg \
|
||||
/boot/grub2/grubenv \
|
||||
%ghost %config(noreplace) %attr(0700,root,root)/boot/efi/EFI/%{efidir}/grubenv \
|
||||
%{expand:%if 0%{?without_efi_modules} \
|
||||
|
@ -508,7 +508,7 @@ touch ${RPM_BUILD_ROOT}/boot/%{name}/grub.cfg \
|
|||
%endif} \
|
||||
\
|
||||
%{expand:%%files %{1}-cdboot} \
|
||||
%defattr(-,root,root,-) \
|
||||
%attr(0755,root,root)/boot/efi/EFI/%{efidir}/%{3} \
|
||||
%attr(0755,root,root)/boot/efi/EFI/%{efidir}/fonts \
|
||||
%defattr(0700,root,root,-) \
|
||||
%attr(0700,root,root)/boot/efi/EFI/%{efidir}/%{3} \
|
||||
%attr(0700,root,root)/boot/efi/EFI/%{efidir}/fonts \
|
||||
%{nil}
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
Name: grub2
|
||||
Epoch: 1
|
||||
Version: 2.02
|
||||
Release: 22%{?dist}
|
||||
Release: 23%{?dist}
|
||||
Summary: Bootloader with support for Linux, Multiboot and more
|
||||
Group: System Environment/Base
|
||||
License: GPLv3+
|
||||
|
@ -314,7 +314,7 @@ fi
|
|||
%exclude /boot/%{name}/themes/system/*
|
||||
%attr(0700,root,root) %dir /boot/grub2
|
||||
%exclude /boot/grub2/*
|
||||
%dir %attr(0755,root,root) /boot/efi/EFI/%{efidir}
|
||||
%dir %attr(0700,root,root) /boot/efi/EFI/%{efidir}
|
||||
%exclude /boot/efi/EFI/%{efidir}/*
|
||||
%license COPYING
|
||||
%ghost %config(noreplace) /boot/grub2/grubenv
|
||||
|
@ -454,6 +454,10 @@ fi
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Feb 27 2018 Peter Jones <pjones@redhat.com> - 2.02-23
|
||||
- Fix directory/file permissions on /boot/efi/* to match what the filesystem
|
||||
enforces.
|
||||
|
||||
* Tue Jan 23 2018 Peter Jones <pjones@redhat.com> - 2.02-22
|
||||
- Fix a merge error from 2.02-21 that affected kernel loading on Aarch64.
|
||||
Related: rhbz#1519311
|
||||
|
|
Loading…
Reference in a new issue