MSVSphere Packaging Team
1 year ago
parent
73d86dc8e2
commit
1164c0f132
@ -0,0 +1,73 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Fedora Ninjas <grub2-owner@fedoraproject.org>
|
||||||
|
Date: Tue, 8 Aug 2023 05:44:48 -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
|
||||||
|
|
||||||
|
Signed-off-by: mkl <mlewando@redhat.com>
|
||||||
|
---
|
||||||
|
util/grub-mkconfig.in | 10 ++++++++++
|
||||||
|
util/grub.d/10_linux.in | 4 +++-
|
||||||
|
2 files changed, 13 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
|
||||||
|
index 520a672cd2c8..30a2d097823d 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,11 @@ 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..76fc21fb6528 100644
|
||||||
|
--- a/util/grub.d/10_linux.in
|
||||||
|
+++ b/util/grub.d/10_linux.in
|
||||||
|
@@ -265,7 +265,9 @@ if [ -z "\${kernelopts}" ]; then
|
||||||
|
fi
|
||||||
|
EOF
|
||||||
|
|
||||||
|
- if [ "x${GRUB_GRUBENV_UPDATE}" = "xyes" ]; then
|
||||||
|
+ if [ "x${GRUB_UPDATE_BLS_CMDLINE}" = "xyes" ] || \
|
||||||
|
+ ( [ -w /etc/kernel ] && [[ ! -f /etc/kernel/cmdline ]] && \
|
||||||
|
+ [ "x${GRUB_GRUBENV_UPDATE}" = "xyes" ] ); then
|
||||||
|
update_bls_cmdline
|
||||||
|
fi
|
||||||
|
|
||||||
@ -0,0 +1,37 @@
|
|||||||
|
From f4f134582912851628e15df4963b3b8a6652aa26 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Marta Lewandowska <mlewando@redhat.com>
|
||||||
|
Date: Tue, 29 Aug 2023 16:40:47 +0200
|
||||||
|
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 | 8 +++++---
|
||||||
|
1 file changed, 5 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
||||||
|
index 76fc21fb6528..041a11529588 100644
|
||||||
|
--- a/util/grub.d/10_linux.in
|
||||||
|
+++ b/util/grub.d/10_linux.in
|
||||||
|
@@ -265,9 +265,11 @@ if [ -z "\${kernelopts}" ]; then
|
||||||
|
fi
|
||||||
|
EOF
|
||||||
|
|
||||||
|
- if [ "x${GRUB_UPDATE_BLS_CMDLINE}" = "xyes" ] || \
|
||||||
|
- ( [ -w /etc/kernel ] && [[ ! -f /etc/kernel/cmdline ]] && \
|
||||||
|
- [ "x${GRUB_GRUBENV_UPDATE}" = "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
|
||||||
|
|
||||||
|
--
|
||||||
|
2.41.0
|
||||||
|
|
||||||
Loading…
Reference in new issue