From 7a35ff39a87508f3f4acf77412945f584628055f Mon Sep 17 00:00:00 2001
From: Nicolas Frayer <nfrayer@redhat.com>
Date: Mon, 28 Aug 2023 18:40:28 +0200
Subject: [PATCH] util: Regenerate kernelopts if missing on ppc

Resolves: #2051889
Signed-off-by: Nicolas Frayer <nfrayer@redhat.com>
---
 ...enerate-kernelopts-if-missing-on-ppc.patch | 36 +++++++++++++++++++
 grub.patches                                  |  1 +
 grub2.spec                                    |  6 +++-
 3 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 0579-Regenerate-kernelopts-if-missing-on-ppc.patch

diff --git a/0579-Regenerate-kernelopts-if-missing-on-ppc.patch b/0579-Regenerate-kernelopts-if-missing-on-ppc.patch
new file mode 100644
index 0000000..4895dd1
--- /dev/null
+++ b/0579-Regenerate-kernelopts-if-missing-on-ppc.patch
@@ -0,0 +1,36 @@
+From 8c74431327e0c7d7fe47462b0e69fcbe3bbac56e Mon Sep 17 00:00:00 2001
+From: Marta Lewandowska <mlewando@redhat.com>
+Date: Fri, 24 Mar 2023 09:14:29 -0400
+Subject: [PATCH] Regenerate kernelopts if missing on ppc
+
+Signed-off-by: Marta Lewandowska <mlewando@redhat.com>
+---
+ util/grub.d/10_linux_bls.in | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/util/grub.d/10_linux_bls.in b/util/grub.d/10_linux_bls.in
+index 855dbdd..f2281bc 100644
+--- a/util/grub.d/10_linux_bls.in
++++ b/util/grub.d/10_linux_bls.in
+@@ -117,6 +117,18 @@ cat <<EOF
+ # This section was generated by a script. Do not modify the generated file - all changes
+ # will be lost the next time file is regenerated. Instead edit the BootLoaderSpec files.
+ 
++# The kernelopts variable should be defined in the grubenv file. But to ensure that menu
++# entries populated from BootLoaderSpec files that use this variable work correctly even
++# without a grubenv file, define a fallback kernelopts variable if this has not been set.
++#
++# The kernelopts variable in the grubenv file can be modified using the grubby tool or by
++# executing the grub2-mkconfig tool. For the latter, the values of the GRUB_CMDLINE_LINUX
++# and GRUB_CMDLINE_LINUX_DEFAULT options from /etc/default/grub file are used to set both
++# the kernelopts variable in the grubenv file and the fallback kernelopts variable.
++if [ -z "\${kernelopts}" ]; then
++  set kernelopts="root=${linux_root_device_thisversion} ro ${args}"
++fi
++
+ EOF
+ }
+ 
+-- 
+2.39.1
+
diff --git a/grub.patches b/grub.patches
index 3bb7067..c4591e3 100644
--- a/grub.patches
+++ b/grub.patches
@@ -576,3 +576,4 @@ Patch0575: 0575-Enable-shared-processor-mode-in-vector-5.patch
 Patch0576: 0576-efi-http-change-uint32_t-to-uintn_t-for-grub_efi_htt.patch
 Patch0577: 0577-ieee1275-Converting-plain-numbers-to-constants-in-Ve.patch
 Patch0578: 0578-ieee1275-extended-support-in-options-vector5.patch
+Patch0579: 0579-Regenerate-kernelopts-if-missing-on-ppc.patch
diff --git a/grub2.spec b/grub2.spec
index d5290bb..658146f 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -7,7 +7,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.02
-Release:	150%{?dist}
+Release:	151%{?dist}
 Summary:	Bootloader with support for Linux, Multiboot and more
 Group:		System Environment/Base
 License:	GPLv3+
@@ -510,6 +510,10 @@ fi
 %endif
 
 %changelog
+* Mon Aug 28 2023 Nicolas Frayer <nfrayer@redhat.com> - 2.02-151
+- util: Regenerate kernelopts if missing on ppc
+- Resolves: #2051889
+
 * Fri Jun 16 2023 Nicolas Frayer <nfrayer@redhat.com> - 2.02-150
 - kern/ieee1275/init: sync vec5 patchset with upstream
 - Resolves: #2172111