20-grub-install: Explicitly check '+debug' suffix for debug kernels
The kernel-install script is also used to install kernels when built from source using the `make install` target. And if this source contains modifications, a '+' is added as suffix by the scripts/setlocalversion if no LOCALVERSION was set in the kernel config. This confuses the grub2 kernel-install plugin, since it currently assumes that any kernel that contain a version with a '+' suffix is a debug kernel. But the match is too greedy, just having '+debug' should be enough to check whether the kernel to install is a debug kernel or not. Resolves: #2148351 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
This commit is contained in:
parent
1163f8ebfd
commit
22838ae9d7
@ -139,7 +139,7 @@ case "$COMMAND" in
|
||||
sed -i -e "s,^initrd.*,initrd ${BOOTPREFIX}${INITRD},g" "${BLS_TARGET}"
|
||||
fi
|
||||
|
||||
if [[ "$KERNEL_VERSION" == *\+* ]] && [ "x$GRUB_DEFAULT_TO_DEBUG" != "xtrue" ]; then
|
||||
if [[ "$KERNEL_VERSION" == *\+debug* ]] && [ "x$GRUB_DEFAULT_TO_DEBUG" != "xtrue" ]; then
|
||||
GRUB_UPDATE_DEFAULT_KERNEL=false
|
||||
fi
|
||||
|
||||
|
@ -17,7 +17,7 @@
|
||||
Name: grub2
|
||||
Epoch: 1
|
||||
Version: 2.06
|
||||
Release: 80%{?dist}
|
||||
Release: 81%{?dist}
|
||||
Summary: Bootloader with support for Linux, Multiboot and more
|
||||
License: GPLv3+
|
||||
URL: http://www.gnu.org/software/grub/
|
||||
@ -544,6 +544,10 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Feb 01 2023 Javier Martinez Canillas <javierm@redhat.com> - 2.06-81
|
||||
- 20-grub-install: Explicitly check '+debug' suffix for debug kernels
|
||||
- Resolves: #2148351
|
||||
|
||||
* Wed Feb 01 2023 Robbie Harwood <rharwood@redhat.com> - 2.06-80
|
||||
- Bump to re-run signing
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user