From 7aade2fc8ef4cd7c46e762aa415344f4fbc9e633 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 17 2022 10:14:15 +0000
Subject: import grubby-8.40-45.el8


---

diff --git a/SOURCES/grubby-bls b/SOURCES/grubby-bls
index 591c9d2..6357e38 100755
--- a/SOURCES/grubby-bls
+++ b/SOURCES/grubby-bls
@@ -524,6 +524,13 @@ update_bls_fragment() {
 	fi
     fi
 
+    if [[ $bootloader = grub2 ]] && [[ ! -f /etc/kernel/cmdline ]]; then
+	opts=$(grub2-editenv "${env}" list | grep kernelopts | sed 's/kernelopts=//')
+	if [[ -n $opts ]]; then
+	    echo "opts" > /etc/kernel/cmdline
+	fi
+    fi
+
     for i in ${indexes[*]}; do
 	if [[ -n $remove_args || -n $add_args ]]; then
             local old_args="$(get_bls_args "$i")"
diff --git a/SPECS/grubby.spec b/SPECS/grubby.spec
index 2b68829..9c014ed 100644
--- a/SPECS/grubby.spec
+++ b/SPECS/grubby.spec
@@ -1,6 +1,6 @@
 Name: grubby
 Version: 8.40
-Release: 44%{?dist}
+Release: 45%{?dist}
 Summary: Command line tool for updating BootLoaderSpec files
 License: GPLv2+
 URL: https://github.com/rhinstaller/grubby
@@ -170,6 +170,10 @@ current boot environment.
 
 %changelog
 * Thu Aug 11 2022 Robbie Harwood <rharwood@redhat.com> - 8.40-44
+- Write to /etc/kernel/cmdline on non-s390x also
+- Resolves: #1978226
+
+* Thu Aug 11 2022 Robbie Harwood <rharwood@redhat.com> - 8.40-44
 - Write to /etc/kernel/cmdline on s390x and only s390x
 - Resolves: #1978226