grub-mkconfig dont overwrite BLS cmdline if BLSCFG
Resolves: #RHEL-53848 Signed-off-by: Nicolas Frayer <nfrayer@redhat.com>
This commit is contained in:
Nicolas Frayer
parent
91198fdd6c
commit
7e8f0f0dcf
@ -0,0 +1,72 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Marta Lewandowska <mlewando@redhat.com>
|
||||
Date: Mon, 17 Jul 2023 16:03:39 -0400
|
||||
Subject: [PATCH] grub-mkconfig dont overwrite BLS cmdline if BLSCFG
|
||||
|
||||
If GRUB_ENABLE_BLSCFG is true, running grub2-mkconfig will not
|
||||
overwrite kernel cmdline in BLS snippets with what is in
|
||||
GRUB_CMDLINE_LINUX in /etc/default/grub. Update can be forced by
|
||||
sending new arg --update-bls-cmdline, thus decoupling cmdline
|
||||
updates from updates of other parameters. GRUB_GRUBENV_UPDATE
|
||||
remains 'yes' by default.
|
||||
|
||||
Signed-off-by: mkl <mlewando@redhat.com>
|
||||
---
|
||||
util/grub-mkconfig.in | 9 +++++++++
|
||||
util/grub.d/10_linux.in | 2 +-
|
||||
2 files changed, 10 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
|
||||
index 520a672cd2c8..34f7c13fc521 100644
|
||||
--- a/util/grub-mkconfig.in
|
||||
+++ b/util/grub-mkconfig.in
|
||||
@@ -51,6 +51,7 @@ export TEXTDOMAIN=@PACKAGE@
|
||||
export TEXTDOMAINDIR="@localedir@"
|
||||
|
||||
export GRUB_GRUBENV_UPDATE="yes"
|
||||
+export GRUB_UPDATE_BLS_CMDLINE="yes"
|
||||
|
||||
. "${pkgdatadir}/grub-mkconfig_lib"
|
||||
|
||||
@@ -62,6 +63,7 @@ usage () {
|
||||
echo
|
||||
print_option_help "-o, --output=$(gettext FILE)" "$(gettext "output generated config to FILE [default=stdout]")"
|
||||
print_option_help "--no-grubenv-update" "$(gettext "do not update variables in the grubenv file")"
|
||||
+ print_option_help "--update-bls-cmdline" "$(gettext "overwrite BLS cmdline args with default args")"
|
||||
print_option_help "-h, --help" "$(gettext "print this message and exit")"
|
||||
print_option_help "-V, --version" "$(gettext "print the version information and exit")"
|
||||
echo
|
||||
@@ -100,6 +102,9 @@ do
|
||||
--no-grubenv-update)
|
||||
GRUB_GRUBENV_UPDATE="no"
|
||||
;;
|
||||
+ --update-bls-cmdline)
|
||||
+ bls_cmdline_update=true
|
||||
+ ;;
|
||||
-*)
|
||||
gettext_printf "Unrecognized option \`%s'\n" "$option" 1>&2
|
||||
usage
|
||||
@@ -167,6 +172,10 @@ fi
|
||||
|
||||
eval "$("${grub_get_kernel_settings}")" || true
|
||||
|
||||
+if [ "x${GRUB_ENABLE_BLSCFG}" = "xtrue" ] && [ "x${bls_cmdline_update}" != "xtrue" ]; then
|
||||
+ GRUB_UPDATE_BLS_CMDLINE="no"
|
||||
+fi
|
||||
+
|
||||
if [ "x${GRUB_DISABLE_UUID}" = "xtrue" ]; then
|
||||
if [ -z "${GRUB_DISABLE_LINUX_UUID}" ]; then
|
||||
GRUB_DISABLE_LINUX_UUID="true"
|
||||
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
||||
index 4795a63b4ce6..72b75effe448 100644
|
||||
--- a/util/grub.d/10_linux.in
|
||||
+++ b/util/grub.d/10_linux.in
|
||||
@@ -265,7 +265,7 @@ if [ -z "\${kernelopts}" ]; then
|
||||
fi
|
||||
EOF
|
||||
|
||||
- if [ "x${GRUB_GRUBENV_UPDATE}" = "xyes" ]; then
|
||||
+ if [ "x${GRUB_UPDATE_BLS_CMDLINE}" = "xyes" ]; then
|
||||
update_bls_cmdline
|
||||
fi
|
||||
|
||||
@ -0,0 +1,32 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Marta Lewandowska <mlewando@redhat.com>
|
||||
Date: Mon, 27 May 2024 13:03:32 -0600
|
||||
Subject: [PATCH] grub2-mkconfig: Pass all boot params when used by anaconda
|
||||
|
||||
Previous patch makes it so that the machine can boot, but not all
|
||||
boot params are passed from /etc/default/grub to BLS snippets
|
||||
because /etc/default/grub gets written by anaconda during boot
|
||||
loader installation, long after grub rpms first got installed.
|
||||
|
||||
Signed-off-by: Marta Lewandowska <mlewando@redhat.com>
|
||||
---
|
||||
util/grub.d/10_linux.in | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
||||
index 72b75effe448..041a11529588 100644
|
||||
--- a/util/grub.d/10_linux.in
|
||||
+++ b/util/grub.d/10_linux.in
|
||||
@@ -265,7 +265,11 @@ if [ -z "\${kernelopts}" ]; then
|
||||
fi
|
||||
EOF
|
||||
|
||||
- if [ "x${GRUB_UPDATE_BLS_CMDLINE}" = "xyes" ]; then
|
||||
+ if [ "x${GRUB_UPDATE_BLS_CMDLINE}" = "xyes" ] || [[ -d /run/install ]]; then
|
||||
+ # only update the bls cmdline if the user specifically requests it or _anytime_
|
||||
+ # in the installer environment: /run/install directory only exists during the
|
||||
+ # installation and not in cloud images, so this should get all the boot params
|
||||
+ # from /etc/default/grub into BLS snippets
|
||||
update_bls_cmdline
|
||||
fi
|
||||
|
||||
@ -351,3 +351,5 @@ Patch0350: 0350-fs-xfs-Fix-XFS-directory-extent-parsing.patch
|
||||
Patch0351: 0351-grub2-mkconfig-Ensure-grub-cfg-stub-is-not-overwritt.patch
|
||||
Patch0352: 0352-grub2-mkconfig-Simplify-os_name-detection.patch
|
||||
Patch0353: 0353-grub-mkconfig-Remove-check-for-mount-point-for-grub-.patch
|
||||
Patch0354: 0354-grub-mkconfig-dont-overwrite-BLS-cmdline-if-BLSCFG.patch
|
||||
Patch0355: 0355-grub2-mkconfig-Pass-all-boot-params-when-used-by-ana.patch
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
Name: grub2
|
||||
Epoch: 1
|
||||
Version: 2.06
|
||||
Release: 125%{?dist}
|
||||
Release: 126%{?dist}
|
||||
Summary: Bootloader with support for Linux, Multiboot and more
|
||||
License: GPL-3.0-or-later
|
||||
URL: http://www.gnu.org/software/grub/
|
||||
@ -573,6 +573,10 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Aug 28 2024 Nicolas Frayer <nfrayer@redhat.com> - 2.06-126
|
||||
- grub-mkconfig dont overwrite BLS cmdline if BLSCFG
|
||||
- Resolves: #RHEL-53848
|
||||
|
||||
* Mon Aug 5 2024 Peter Jones <pjones@redhat.com> - 2.06-125
|
||||
- spec/macros: Modified spec and macros files for RHEL10 signing
|
||||
- Related: #RHEL-51867
|
||||
|
||||
Loading…
Reference in New Issue
Block a user