From 8052f1a8283cb21b81cd360e7a1fe674e34a80cd Mon Sep 17 00:00:00 2001 From: Qin Fandong Date: Mon, 29 Sep 2025 12:00:08 +0800 Subject: [PATCH] 20-grub.install: also set kernel-4k and kernel-64k as default --- 20-grub.install | 3 ++- grub2.spec | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/20-grub.install b/20-grub.install index 8ae3885..819c363 100644 --- a/20-grub.install +++ b/20-grub.install @@ -113,7 +113,8 @@ 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 + # Only match debug kernel, ignore kernel-4k and kernel-64k here + if [[ "$KERNEL_VERSION" == *\+debug* ]] && [ "x$GRUB_DEFAULT_TO_DEBUG" != "xtrue" ]; then GRUB_UPDATE_DEFAULT_KERNEL=false fi diff --git a/grub2.spec b/grub2.spec index b959e1d..84ea8c7 100644 --- a/grub2.spec +++ b/grub2.spec @@ -23,7 +23,7 @@ Name: grub2 Epoch: 1 Version: 2.12 -Release: 44 +Release: 45 Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -464,6 +464,9 @@ fi %{_datadir}/man/man* %changelog +* Mon Sep 29 2025 Qin Fandong - 1:2.12-45 +- 20-grub.install: also set kernel-4k and kernel-64k as default + * Mon Aug 18 2025 zhangqiumiao - 1:2.12-44 - Type:bugfix - CVE:NA -- Gitee