mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 14:32:58 +00:00
3b94406a9e
CVE-2020-10713 CVE-2020-14308 CVE-2020-14309 CVE-2020-14310 CVE-2020-14311 CVE-2020-15705 CVE-2020-15706 CVE-2020-15707 Signed-off-by: Peter Jones <pjones@redhat.com>
48 lines
1.9 KiB
Diff
48 lines
1.9 KiB
Diff
From 217890e8fd2235e92e59f54a68a2c19dcc67cc8e Mon Sep 17 00:00:00 2001
|
|
From: Javier Martinez Canillas <javierm@redhat.com>
|
|
Date: Tue, 15 Oct 2019 09:08:25 +0200
|
|
Subject: [PATCH 193/237] 10_linux.in: Also use GRUB_CMDLINE_LINUX_DEFAULT to
|
|
set kernelopts
|
|
|
|
The GRUB documentation mentions that there are two variables to set the
|
|
linux kernel cmdline: GRUB_CMDLINE_LINUX and GRUB_CMDLINE_LINUX_DEFAULT.
|
|
|
|
The former is added to all the menuentry commands and the latter is not
|
|
added to the recovery mode menu entries. But the blscfg module doesn't
|
|
populate recovery entries from the BLS snippets, so the values set in the
|
|
GRUB_CMDLINE_LINUX_DEFAULT variable should also be included in kernelopts.
|
|
|
|
This is needed because the GRUB_CMDLINE_LINUX_DEFAULT option is mentioned
|
|
in the GRUB documentation so users assume that the kernel cmdline options
|
|
can be changed by setting this option and running the grub2-mkconfig tool.
|
|
|
|
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
|
|
---
|
|
util/grub.d/10_linux.in | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
|
index 3919b8aff4e..9e015c2c134 100644
|
|
--- a/util/grub.d/10_linux.in
|
|
+++ b/util/grub.d/10_linux.in
|
|
@@ -118,7 +118,7 @@ if [ "x${GRUB_ENABLE_BLSCFG}" = "xtrue" ]; then
|
|
populate_header_warn
|
|
|
|
cat << EOF
|
|
-set default_kernelopts="root=${LINUX_ROOT_DEVICE} ro ${GRUB_CMDLINE_LINUX}"
|
|
+set default_kernelopts="root=${LINUX_ROOT_DEVICE} ro ${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
|
|
|
|
insmod blscfg
|
|
blscfg
|
|
@@ -134,7 +134,7 @@ EOF
|
|
fi
|
|
fi
|
|
|
|
- ${grub_editenv} - set kernelopts="root=${LINUX_ROOT_DEVICE} ro ${GRUB_CMDLINE_LINUX}"
|
|
+ ${grub_editenv} - set kernelopts="root=${LINUX_ROOT_DEVICE} ro ${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
|
|
if [ -n "${GRUB_EARLY_INITRD_LINUX_CUSTOM}" ]; then
|
|
${grub_editenv} - set early_initrd="${GRUB_EARLY_INITRD_LINUX_CUSTOM}"
|
|
fi
|
|
--
|
|
2.26.2
|
|
|