diff --git a/0001-new-kernel-pkg-also-set-kernel-4k-and-kernel-64k-as-.patch b/0001-new-kernel-pkg-also-set-kernel-4k-and-kernel-64k-as-.patch new file mode 100644 index 0000000000000000000000000000000000000000..889586ba280677f9a434bea4b70ea03e26ef2089 --- /dev/null +++ b/0001-new-kernel-pkg-also-set-kernel-4k-and-kernel-64k-as-.patch @@ -0,0 +1,28 @@ +From fdcf4a9b49a7e86a85218867dd878d8c30b3858a Mon Sep 17 00:00:00 2001 +From: Qin Fandong +Date: Mon, 29 Sep 2025 11:45:58 +0800 +Subject: [PATCH] new-kernel-pkg: also set kernel-4k and kernel-64k as default + kernel + +--- + new-kernel-pkg | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/new-kernel-pkg b/new-kernel-pkg +index a906a13..df1e17c 100755 +--- a/new-kernel-pkg ++++ b/new-kernel-pkg +@@ -754,7 +754,9 @@ fi + + # set this as the default if we have the package and it matches + if [ "$mode" == "--install" -a "$UPDATEDEFAULT" == "yes" -a -n "$package" -a -n "$DEFAULTKERNEL" ]; then +- if [ "$package" == "$DEFAULTKERNEL" -o "${package}-core" == "$DEFAULTKERNEL" ]; then ++ # also set kenerl-4k and kernel-64k to default kernel ++ if [ "$package" == "$DEFAULTKERNEL" -o "${package}-core" == "$DEFAULTKERNEL" \ ++ -o "${package%-*k}" == "$DEFAULTKERNEL" -o "${package%-*k}-core" == "$DEFAULTKERNEL" ]; then + makedefault="--make-default" + [ -n "$verbose" ] && echo "making it the default based on config" + fi +-- +2.43.0 + diff --git a/grubby.spec b/grubby.spec index f9e2c1dbd90b408c70def7a80fee2a9ad6fb7b29..953c6ec1c158d0b6a101a58929e92b0032110cd2 100644 --- a/grubby.spec +++ b/grubby.spec @@ -1,6 +1,6 @@ Name: grubby Version: 8.40 -Release: 27 +Release: 28 Summary: Update and display information about the configuration files License: GPLv2+ URL: https://github.com/rhinstaller/grubby @@ -33,6 +33,7 @@ Patch6015: backport-Make-SET_VARIABLE-get-handled-individually-in-GetNex.patch Patch9001: fix-make-test-fail-when-no-boot-partition.patch Patch9002: grubby-aarch64-skip-test-grub2.15.patch +Patch9003: 0001-new-kernel-pkg-also-set-kernel-4k-and-kernel-64k-as-.patch BuildRequires: gcc pkgconfig glib2-devel popt-devel BuildRequires: libblkid-devel git-core sed make @@ -107,6 +108,9 @@ sed -e "s,@@LIBEXECDIR@@,%{_libexecdir}/installkernel,g" %{SOURCE3} > %{buildroo %{_mandir}/man8/*.8* %changelog +* Fri Oct 10 2025 yanglongkang - 8.40-28 +- new-kernel-pkg: also set kernel-4k and kernel-64k as default + * Sat Feb 18 2023 zhangnan - 8.40-27 - enable make test