From b67b6d6b8e44b8f4e20f989a1e2f9c291ba32642 Mon Sep 17 00:00:00 2001
From: Peridot Bot <rockyautomation@rockylinux.org>
Date: Thu, 18 Apr 2024 03:03:05 +0000
Subject: [PATCH] import grubby-8.40-64.el9
---
.grubby.checksum | 1 +
.grubby.metadata | 2 +-
SOURCES/grubby-bls | 2 +-
SPECS/grubby.spec | 6 +++++-
4 files changed, 8 insertions(+), 3 deletions(-)
create mode 100644 .grubby.checksum
diff --git a/.grubby.checksum b/.grubby.checksum
new file mode 100644
index 0000000..7607ae8
--- /dev/null
+++ b/.grubby.checksum
@@ -0,0 +1 @@
+4f379bba6e7d145c5c68b0c7f7147052f13e6ff234ae2a3a5068c6d793052df9
diff --git a/.grubby.metadata b/.grubby.metadata
index 6085fc6..e6061b7 100644
--- a/.grubby.metadata
+++ b/.grubby.metadata
@@ -1 +1 @@
-97ae8d113b74538c05f05083dcff4f44012fd0cd SOURCES/8.40-1.tar.gz
+85f1c678484f74c8978e8643451594967defce463a86c35cb1ee56d12767a9df SOURCES/8.40-1.tar.gz
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
--
GitLab