From 3da21eddeba31dc56a53ff0295d6b005b2b0dd06 Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Tue, 11 Nov 2025 09:48:55 +0000
Subject: [PATCH] import CS grubby-8.40-68.el9

---
 SOURCES/grubby-bls | 30 ++++++++++--------------------
 SPECS/grubby.spec  | 18 +++++++++++++++++-
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/SOURCES/grubby-bls b/SOURCES/grubby-bls
index fef62db..fc50e67 100755
--- a/SOURCES/grubby-bls
+++ b/SOURCES/grubby-bls
@@ -563,7 +563,7 @@ set_default_bls() {
             echo "default=${default}" >> "${zipl_config}"
         fi
     fi
-
+    update_grubcfg
     print_info "The default is ${bls_file[$index]} with index $index and kernel $(get_prefix)${bls_linux[$index]}"
 }
 
@@ -595,28 +595,18 @@ remove_var_prefix() {
 
 update_grubcfg()
 {
-    # 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.
+    # Older ppc64le OPAL firmware 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
         RUN_MKCONFIG="true"
-        petitboot_path="/sys/firmware/devicetree/base/ibm,firmware-versions/petitboot"
+    fi
 
-        if test -e ${petitboot_path}; then
-            read -r -d '' petitboot_version < ${petitboot_path}
-            petitboot_version="$(echo ${petitboot_version//v})"
-
-            if test -n ${petitboot_version}; then
-                major_version="$(echo ${petitboot_version} | cut -d . -f1)"
-                minor_version="$(echo ${petitboot_version} | cut -d . -f2)"
-
-                re='^[0-9]+$'
-                if [[ $major_version =~ $re ]] && [[ $minor_version =~ $re ]] &&
-                       ([[ ${major_version} -gt 1 ]] ||
-                            [[ ${major_version} -eq 1 &&
-                                 ${minor_version} -ge 8  ]]); then
-                    RUN_MKCONFIG="false"
-                fi
-            fi
+    # PV and PVH Xen DomU guests boot with pygrub that doesn't have BLS support,
+    # also Xen Dom0 use the menuentries from 20_linux_xen and not the ones from
+    # 10_linux. So grub2-mkconfig has to run for both Xen Dom0 and DomU.
+    if [[ -e /sys/hypervisor/type ]] && grep -q "^xen$" /sys/hypervisor/type; then
+        if [ ! -e /sys/hypervisor/guest_type ] || ! grep -q "^HVM$" /sys/hypervisor/guest_type; then
+            RUN_MKCONFIG=true
         fi
     fi
 
diff --git a/SPECS/grubby.spec b/SPECS/grubby.spec
index 658ec91..d4ab5df 100644
--- a/SPECS/grubby.spec
+++ b/SPECS/grubby.spec
@@ -1,6 +1,6 @@
 Name: grubby
 Version: 8.40
-Release: 64%{?dist}
+Release: 68%{?dist}
 Summary: Command line tool for updating bootloader configs
 License: GPLv2+
 URL: https://github.com/rhinstaller/grubby
@@ -131,6 +131,22 @@ current boot environment.
 %{_mandir}/man8/*.8*
 
 %changelog
+* Wed Jul 30 2025 Leo Sandoval <lsandova@redhat.com> - 8.40-68
+- Update cfg when setting a default kernel
+  Resolves: #RHEL-106612
+
+* Mon May 19 2025 Nicolas Frayer <nfrayer@redhat.com> - 8.40-67
+- Bump NVR
+- Related: #RHEL-61421
+
+* Fri Dec 06 2024 Leo Sandoval <lsandova@redhat.com> - 8.40-66
+- grubby-bls: on PPC systems, remove petiboot's version checks
+- Resolves: #RHEL-61421
+
+* Thu Dec 05 2024 Leo Sandoval <lsandova@redhat.com> - 8.40-65
+- On grub cfg updates, run grub2-mkconfig for Xen systems
+  Resolves: #RHEL-50691
+
 * Wed Jan 10 2024 Marta Lewandowska <mlewando@redhat.com> - 8.40-64
 - Do not overwrite all vars that start with GRUB_CMDLINE_LINUX
 - Resolves: #RHEL-21301