From 3db459f407cd87b01b945e7760111460751e124b Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 9 May 2023 05:31:48 +0000
Subject: [PATCH] import grubby-8.40-63.el9

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

diff --git a/SOURCES/grubby-bls b/SOURCES/grubby-bls
index f09156b..3c2544a 100755
--- a/SOURCES/grubby-bls
+++ b/SOURCES/grubby-bls
@@ -833,7 +833,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 a67dfde..d83cd91 100644
--- a/SPECS/grubby.spec
+++ b/SPECS/grubby.spec
@@ -1,6 +1,6 @@
 Name: grubby
 Version: 8.40
-Release: 61%{?dist}
+Release: 63%{?dist}
 Summary: Command line tool for updating bootloader configs
 License: GPLv2+
 URL: https://github.com/rhinstaller/grubby
@@ -131,6 +131,14 @@ current boot environment.
 %{_mandir}/man8/*.8*
 
 %changelog
+* Tue Feb 21 2023 Marta Lewandowska <mlewando@redhat.com> - 8.40-63
+- remove root= when not copying default
+- Resolves: #2127453
+
+* Wed Feb 15 2022 Robbie Harwood <rharwood@redhat.com> - 8.40-62
+- Apply Marta's default args fix
+- Resolves: #2127453
+
 * Thu Aug 25 2022 Robbie Harwood <rharwood@redhat.com> - 8.40-61
 - Sync args changes with 8.40-66.fc38
 - Resolves: #1969362