Merge branch 'c9' into a9
This commit is contained in:
commit
13c0af2543
@ -16,7 +16,7 @@
|
|||||||
Name: grub2
|
Name: grub2
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 2.06
|
Version: 2.06
|
||||||
Release: 80%{?dist}.alma.1
|
Release: 82%{?dist}.alma.1
|
||||||
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/
|
||||||
@ -330,6 +330,10 @@ if test ! -f ${EFI_HOME}/grub.cfg; then
|
|||||||
# there's no config in ESP, create one
|
# there's no config in ESP, create one
|
||||||
grub2-mkconfig -o ${EFI_HOME}/grub.cfg
|
grub2-mkconfig -o ${EFI_HOME}/grub.cfg
|
||||||
cp -a ${EFI_HOME}/grub.cfg ${EFI_HOME}/grub.cfg.rpmsave
|
cp -a ${EFI_HOME}/grub.cfg ${EFI_HOME}/grub.cfg.rpmsave
|
||||||
|
fi
|
||||||
|
|
||||||
|
# need to move grub.cfg to correct dir for major version upgrade
|
||||||
|
if ! grep -q "configfile" ${EFI_HOME}/grub.cfg; then
|
||||||
cp -a ${EFI_HOME}/grub.cfg ${GRUB_HOME}/
|
cp -a ${EFI_HOME}/grub.cfg ${GRUB_HOME}/
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -524,9 +528,13 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Jun 13 2024 Eduard Abdullin <eabdullin@almalinux.org> - 2.06-80.alma.1
|
* Tue Sep 03 2024 Eduard Abdullin <eabdullin@almalinux.org> - 2.06-82.alma.1
|
||||||
- Debrand for AlmaLinux
|
- Debrand for AlmaLinux
|
||||||
|
|
||||||
|
* Tue Jun 25 2024 Marta Lewandowska <mlewando@redhat.com> - 2.06-81
|
||||||
|
- grub.cfg: Fix an issue when doing a major version upgrade
|
||||||
|
- Resolves: #RHEL-45008
|
||||||
|
|
||||||
* Tue May 28 2024 Nicolas Frayer <nfrayer@redhat.com> - 2.06-80
|
* Tue May 28 2024 Nicolas Frayer <nfrayer@redhat.com> - 2.06-80
|
||||||
- Added more code for the previous CVE fix
|
- Added more code for the previous CVE fix
|
||||||
- Related: #RHEL-36249
|
- Related: #RHEL-36249
|
||||||
|
Loading…
Reference in New Issue
Block a user