From da12035a271c6d9532518fddacbe43af0fff3ad7 Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Wed, 15 May 2024 07:28:37 +0000
Subject: [PATCH] Import from AlmaLinux stable repository

---
 SOURCES/grubby-bls | 2 +-
 SPECS/grubby.spec  | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/SOURCES/grubby-bls b/SOURCES/grubby-bls
index 3c2544a..fef62db 100755
--- a/SOURCES/grubby-bls
+++ b/SOURCES/grubby-bls
@@ -500,7 +500,7 @@ update_bls_fragment() {
             if [[ -n $old_args ]]; then
                 opts="$(update_args "${old_args}" "${remove_args}" "${add_args}")"
                 opts="$(echo "$opts" | sed -e 's/\//\\\//g')"
-                sed -i -e "s/^GRUB_CMDLINE_LINUX.*/GRUB_CMDLINE_LINUX=\\\"${opts}\\\"/" "${grub_etc_default}"
+                sed -i -e "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\\\"${opts}\\\"/" "${grub_etc_default}"
             fi
         fi
 
diff --git a/SPECS/grubby.spec b/SPECS/grubby.spec
index d83cd91..658ec91 100644
--- a/SPECS/grubby.spec
+++ b/SPECS/grubby.spec
@@ -1,6 +1,6 @@
 Name: grubby
 Version: 8.40
-Release: 63%{?dist}
+Release: 64%{?dist}
 Summary: Command line tool for updating bootloader configs
 License: GPLv2+
 URL: https://github.com/rhinstaller/grubby
@@ -131,6 +131,10 @@ current boot environment.
 %{_mandir}/man8/*.8*
 
 %changelog
+* Wed Jan 10 2024 Marta Lewandowska <mlewando@redhat.com> - 8.40-64
+- Do not overwrite all vars that start with GRUB_CMDLINE_LINUX
+- Resolves: #RHEL-21301
+
 * Tue Feb 21 2023 Marta Lewandowska <mlewando@redhat.com> - 8.40-63
 - remove root= when not copying default
 - Resolves: #2127453