Auto sync2gitlab import of grubby-8.40-45.el8.src.rpm

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")"

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
@@ -169,6 +169,10 @@ current boot environment.
 %{_mandir}/man8/*.8*
 
 %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