From 03ef4d01cff14a3b8567ce35d6a91d0ecd933f57 Mon Sep 17 00:00:00 2001 From: Qiumiao Zhang Date: Thu, 7 Mar 2024 02:39:46 +0000 Subject: [PATCH] modify klist in 10_linux.in Signed-off-by: Qiumiao Zhang --- grub.patches | 1 + grub2.spec | 8 +++++++- modify-klist-in-10_linux.in.patch | 31 +++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 modify-klist-in-10_linux.in.patch diff --git a/grub.patches b/grub.patches index 0ce5ab7..5b690a9 100644 --- a/grub.patches +++ b/grub.patches @@ -205,5 +205,6 @@ Patch204: 0010-re-write-.gitignore.patch Patch205: disable-some-unsupported-filesystems.patch Patch206: remove-the-items-of-unsupported-filesystems-in-fs.ls.patch Patch207: backport-Read-etc-default-grub.d-.cfg-after-etc-default-grub.patch +Patch208: modify-klist-in-10_linux.in.patch #Patch208: add-TPCM-support-with-ipmi-channel.patch #Patch209: skip-verification-when-not-loading-grub.cfg.patch diff --git a/grub2.spec b/grub2.spec index 9163db0..0ad5992 100644 --- a/grub2.spec +++ b/grub2.spec @@ -14,7 +14,7 @@ Name: grub2 Epoch: 1 Version: 2.12 -Release: 1 +Release: 2 Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -449,6 +449,12 @@ fi %{_datadir}/man/man* %changelog +* Thu Mar 7 2024 zhangqiumiao - 1:2.12-2 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:modify klist in 10_linux.in + * Mon Mar 4 2024 zhangqiumiao - 1:2.12-1 - Type:requirement - CVE:NA diff --git a/modify-klist-in-10_linux.in.patch b/modify-klist-in-10_linux.in.patch new file mode 100644 index 0000000..3c99c32 --- /dev/null +++ b/modify-klist-in-10_linux.in.patch @@ -0,0 +1,31 @@ +From 0c04cb8ee1b85a03d40e4fe626808f590f125f9b Mon Sep 17 00:00:00 2001 +From: Qiumiao Zhang +Date: Thu, 7 Mar 2024 02:35:25 +0000 +Subject: [PATCH] modify klist in 10_linux.in + +--- + util/grub.d/10_linux.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in +index 5531239..ae487a7 100644 +--- a/util/grub.d/10_linux.in ++++ b/util/grub.d/10_linux.in +@@ -202,10 +202,10 @@ EOF + machine=`uname -m` + case "x$machine" in + xi?86 | xx86_64) klist="/boot/vmlinuz-* /vmlinuz-* /boot/kernel-*" ;; +- xaarch64) klist="/boot/Image-* /Image-* /boot/kernel-*" ;; +- xarm*) klist="/boot/zImage-* /zImage-* /boot/kernel-*" ;; +- xriscv64) klist="/boot/Image-* /Image-* /boot/kernel-*" ;; +- xs390 | xs390x) klist="/boot/image-* /boot/kernel-*" ;; ++ xaarch64) klist="/boot/vmlinuz-* /vmlinuz-* /boot/kernel-*" ;; ++ xarm*) klist="/boot/vmlinuz-* /vmlinuz-* /boot/kernel-*" ;; ++ xriscv64) klist="/boot/vmlinuz-* /vmlinuz-* /boot/kernel-*" ;; ++ xs390 | xs390x) klist="/boot/vmlinuz-* /boot/kernel-*" ;; + *) klist="/boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* \ + /boot/kernel-*" ;; + esac +-- +2.33.0 + -- Gitee