From 4d4a2526bd3c598791cd52540708751c43109d07 Mon Sep 17 00:00:00 2001
From: rockyautomation <rockyautomation@rockylinux.org>
Date: Thu, 23 May 2024 03:34:39 +0000
Subject: [PATCH] import grubby-8.40-49.el8
---
.grubby.checksum | 1 +
.grubby.metadata | 2 +-
SOURCES/grubby-bls | 6 ++++--
SPECS/grubby.spec | 10 +++++++++-
4 files changed, 15 insertions(+), 4 deletions(-)
create mode 100644 .grubby.checksum
diff --git a/.grubby.checksum b/.grubby.checksum
new file mode 100644
index 0000000..aaa54cd
--- /dev/null
+++ b/.grubby.checksum
@@ -0,0 +1 @@
+cf243444b0a597051b63da2c3fc86a89d6e187549f0765edd2129ba8ab48f48c
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 360c6e8..07df5c8 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
@@ -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..878b99d 100644
--- a/SPECS/grubby.spec
+++ b/SPECS/grubby.spec
@@ -1,6 +1,6 @@
Name: grubby
Version: 8.40
-Release: 47%{?dist}
+Release: 49%{?dist}
Summary: Command line tool for updating BootLoaderSpec files
License: GPLv2+
URL: https://github.com/rhinstaller/grubby
@@ -169,6 +169,14 @@ current boot environment.
%{_mandir}/man8/*.8*
%changelog
+* Wed Jan 10 2024 Marta Lewandowska <mlewando@redhat.com> - 8.40-49
+- Do not overwrite all vars that start with GRUB_CMDLINE_LINUX
+- Resolves: #RHEL-12853
+
+* 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
--
GitLab