!464 [sync] PR-461: 10_linux: fix missing "ro" in kernel boot parameters

From: @openeuler-sync-bot 
Reviewed-by: @zhangqiumiao 
Signed-off-by: @zhangqiumiao
This commit is contained in:
openeuler-ci-bot 2024-11-04 08:27:43 +00:00 committed by Gitee
commit c1abe607ea
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 40 additions and 1 deletions

View File

@ -0,0 +1,26 @@
From e072ddcb07cc38aa473901b6800712a7a23a556e Mon Sep 17 00:00:00 2001
From: Qiumiao Zhang <zhangqiumiao1@huawei.com>
Date: Thu, 10 Oct 2024 06:55:24 +0000
Subject: [PATCH] 10_linux: fix missing "ro" in kernel boot parameters
Signed-off-by: Qiumiao Zhang <zhangqiumiao1@huawei.com>
---
util/grub.d/10_linux.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index af09e65..eca52ff 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -423,7 +423,7 @@ linux_entry ()
message="$(gettext_printf "Loading Linux %s ..." ${version})"
sed "s/^/$submenu_indentation/" << EOF
echo '$(echo "$message" | grub_quote)'
- linux ${rel_dirname}/${basename} ${root_device} ${args}
+ linux ${rel_dirname}/${basename} ${root_device} ro ${args}
EOF
if test -n "${initrd}" ; then
# TRANSLATORS: ramdisk isn't identifier. Should be translated.
--
2.33.0

View File

@ -240,3 +240,4 @@ Patch239: 0021-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
Patch240: 0061-Add-BLS-support-to-grub-mkconfig.patch Patch240: 0061-Add-BLS-support-to-grub-mkconfig.patch
Patch241: 0064-Add-grub2-switch-to-blscfg.patch Patch241: 0064-Add-grub2-switch-to-blscfg.patch
Patch242: 0001-newfeature-tpcm-add-hygon-tpcm-support.patch Patch242: 0001-newfeature-tpcm-add-hygon-tpcm-support.patch
Patch243: 10_linux-fix-missing-ro-in-kernel-boot-parameters.patch

View File

@ -1,3 +1,8 @@
# This package calls binutils components directly and would need to pass
# in flags to enable the LTO plugins
# Disable LTO
%global _lto_cflags %{nil}
%undefine _hardened_build %undefine _hardened_build
%global tarversion 2.12 %global tarversion 2.12
@ -14,7 +19,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 2.12 Version: 2.12
Release: 24 Release: 25
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/
@ -456,6 +461,13 @@ fi
%{_datadir}/man/man* %{_datadir}/man/man*
%changelog %changelog
* Thu Oct 10 2024 zhangqiumiao <zhangqiumiao1@huawei.com> - 1:2.12-25
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:10_linux: fix missing "ro" in kernel boot parameters
Disable LTO
* Fri Aug 2 2024 chench <chench@hygon.cn> - 1:2.12-24 * Fri Aug 2 2024 chench <chench@hygon.cn> - 1:2.12-24
- Type:requirement - Type:requirement
- CVE:NA - CVE:NA