rpms/grub2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

grub.cfg: Fix an issue when doing a major version upgrade

Browse Source 
Related: #RHEL-56733
Signed-off-by: Marta Lewandowska <mlewando@redhat.com>
Signed-off-by: Nicolas Frayer <nfrayer@redhat.com>
This commit is contained in:
Nicolas Frayer 2024-06-25 17:25:28 +02:00
parent 1022bec884
commit 742532ab73
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
grub2.spec
View File

@ -17,7 +17,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 2.06 Version: 2.06
Release: 131%{?dist} Release: 132%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more Summary: Bootloader with support for Linux, Multiboot and more
License: GPL-3.0-or-later License: GPL-3.0-or-later
URL: http://www.gnu.org/software/grub/ URL: http://www.gnu.org/software/grub/
@ -377,6 +377,10 @@ if test ! -f ${GRUB_HOME}/grub.cfg; then
# there's no config in GRUB_HOME, create one # there's no config in GRUB_HOME, create one
grub2-mkconfig -o ${GRUB_HOME}/grub.cfg grub2-mkconfig -o ${GRUB_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}/
else else
# otherwise just check mode is correct, if not, fix it # otherwise just check mode is correct, if not, fix it
@ -582,6 +586,10 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
%endif %endif
%changelog %changelog
* Mon Sep 23 2024 Marta Lewandowska <mlewando@redhat.com> - 2.06-132
- grub.cfg: Fix an issue when doing a major version upgrade
- Related: #RHEL-56733
* Mon Sep 23 2024 Nicolas Frayer <nfrayer@redhat.com> - 2.06-131 * Mon Sep 23 2024 Nicolas Frayer <nfrayer@redhat.com> - 2.06-131
- Added more code for the previous CVE fix (CVE-2023-4001) - Added more code for the previous CVE fix (CVE-2023-4001)
- Related: #RHEL-56733 - Related: #RHEL-56733