Attachment 1982321 Details for Bug 2212320 – patch v3

[patch] patch v3

0327-grub-mkconfig-dont-overwrite-BLS-cmdline-if-BLSCFG.patch (text/plain), 2.50 KB, created by Marta Lewandowska on 2023-08-08 10:06:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marta Lewandowska

Created: 2023-08-08 10:06:34 UTC

Size: 2.50 KB

patch

obsolete

>From 32ca9ae5928ae084067e1542a90cf230a280f4b1 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 520a672..30a2d09 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 4795a63..76fc21f 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
> 
>-- 
>2.39.3
>

Actions: View | Diff

Attachments on bug 2212320: 1974476 | 1976266 | 1982321