install/ppc64le: run grub2-mkconfig regardless of petitboot version

Resolves: #RHEL-45161
Signed-off-by: Marta Lewandowska <mlewando@redhat.com>
Signed-off-by: Nicolas Frayer <nfrayer@redhat.com>

99-grub-mkconfig.install

@@ -8,23 +8,8 @@ ARCH=$(uname -m)
 # Older ppc64le OPAL firmware (petitboot version < 1.8.0) don't have BLS support
 # so grub2-mkconfig has to be run to generate a config with menuentry commands.
 if [[ $ARCH = "ppc64le" ]] && [ -d /sys/firmware/opal ]; then
-
-    petitboot_path="/sys/firmware/devicetree/base/ibm,firmware-versions/petitboot"
-
-    if test -e ${petitboot_path}; then
-        read -r -d '' petitboot_version < ${petitboot_path}
-        petitboot_version="$(echo ${petitboot_version//v})"
-        major_version="$(echo ${petitboot_version} | cut -d . -f1)"
-        minor_version="$(echo ${petitboot_version} | cut -d . -f2)"
-
-        if test -z ${petitboot_version} || test ${major_version} -lt 1 || \
-           test ${major_version} -eq 1 -a ${minor_version} -lt 8; then
     RUN_MKCONFIG=true
 fi
-    else
-        RUN_MKCONFIG=true
-    fi
-fi
 
 if [[ $DISABLE_BLS = "true" ]]; then
     if grep -q '^GRUB_ENABLE_BLSCFG="*true"*\s*$' /etc/default/grub; then

grub2.spec

@@ -16,7 +16,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.06
-Release:	83%{?dist}
+Release:	84%{?dist}
 Summary:	Bootloader with support for Linux, Multiboot and more
 License:	GPLv3+
 URL:		http://www.gnu.org/software/grub/
@@ -537,6 +537,10 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
 %endif
 
 %changelog
+* Thu Jul 11 2024 Nicolas Frayer <nfrayer@redhat.com> - 2.06-84
+- install/ppc64le: run grub2-mkconfig regardless of petitboot version
+- Resolves: #RHEL-45161
+
 * Mon Jul 1 2024 Leo Sandoval <lsandova@redhat.com> - 2.06-83
 - grub-mkconfig.in: turn off executable owner bit
 - Resolves: RHEL-45870