packages/grub2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!365 modify klist in 10_linux.in

Browse Source 
From: @zhangqiumiao 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
This commit is contained in:
openeuler-ci-bot 2024-03-07 02:51:53 +00:00 committed by Gitee
commit bb82f8bfcf
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
grub.patches
View File

@ -205,5 +205,6 @@ Patch204: 0010-re-write-.gitignore.patch
Patch205: disable-some-unsupported-filesystems.patch Patch205: disable-some-unsupported-filesystems.patch
Patch206: remove-the-items-of-unsupported-filesystems-in-fs.ls.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 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 #Patch208: add-TPCM-support-with-ipmi-channel.patch
#Patch209: skip-verification-when-not-loading-grub.cfg.patch #Patch209: skip-verification-when-not-loading-grub.cfg.patch

8
grub2.spec
View File

@ -14,7 +14,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 2.12 Version: 2.12
Release: 1 Release: 2
Summary: Bootloader with support for Linux, Multiboot and more Summary: Bootloader with support for Linux, Multiboot and more
License: GPLv3+ License: GPLv3+
URL: http://www.gnu.org/software/grub/ URL: http://www.gnu.org/software/grub/
@ -449,6 +449,12 @@ fi
%{_datadir}/man/man* %{_datadir}/man/man*
%changelog %changelog
* Thu Mar 7 2024 zhangqiumiao <zhangqiumiao1@huawei.com> - 1:2.12-2
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:modify klist in 10_linux.in
* Mon Mar 4 2024 zhangqiumiao <zhangqiumiao1@huawei.com> - 1:2.12-1 * Mon Mar 4 2024 zhangqiumiao <zhangqiumiao1@huawei.com> - 1:2.12-1
- Type:requirement - Type:requirement
- CVE:NA - CVE:NA

31
modify-klist-in-10_linux.in.patch Normal file
View File

@ -0,0 +1,31 @@
From 0c04cb8ee1b85a03d40e4fe626808f590f125f9b Mon Sep 17 00:00:00 2001
From: Qiumiao Zhang <zhangqiumiao1@huawei.com>
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