From fa32dfe28c84b8bbbbfd298a742c2109c2be7e88 Mon Sep 17 00:00:00 2001
From: eabdullin <eabdullin@almalinux.org>
Date: Wed, 27 Sep 2023 13:05:37 +0000
Subject: [PATCH] import CS grubby-8.40-48.el8

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

diff --git a/SOURCES/grubby-bls b/SOURCES/grubby-bls
index 360c6e8..f5b9735 100755
--- a/SOURCES/grubby-bls
+++ b/SOURCES/grubby-bls
@@ -812,7 +812,9 @@ if [[ -n $kernel ]]; then
 	    opts="${opts} ${args}"
 	fi
     else
-	opts="${args}"
+	opts="${opts} ${args}"
+	remove_args="$kernelopts"
+	update_args "${opts}" "${remove_args}" ""
     fi
 
     add_bls_fragment "${kernel}" "${title}" "${opts}" "${initrd}" \
diff --git a/SPECS/grubby.spec b/SPECS/grubby.spec
index e8aef0e..1e9ae63 100644
--- a/SPECS/grubby.spec
+++ b/SPECS/grubby.spec
@@ -1,6 +1,6 @@
 Name: grubby
 Version: 8.40
-Release: 47%{?dist}
+Release: 48%{?dist}
 Summary: Command line tool for updating BootLoaderSpec files
 License: GPLv2+
 URL: https://github.com/rhinstaller/grubby
@@ -169,6 +169,10 @@ current boot environment.
 %{_mandir}/man8/*.8*
 
 %changelog
+* Tue Feb 21 2023 Marta Lewandowska <mlewando@redhat.com> - 8.40-48
+- Apply Marta's default args fix
+- Resolves: #1900829
+
 * Mon Oct 10 2022 Robbie Harwood <rharwood@redhat.com> - 8.40-47
 - Backport fedora/rhel9 initial cmdline population
 - Resolves: #2129740