From 9b255cc407ed31796f18c84cb12037f81fd4c4f7 Mon Sep 17 00:00:00 2001
From: Nicolas Frayer <nfrayer@redhat.com>
Date: Mon, 27 Nov 2023 17:19:50 +0100
Subject: [PATCH] util: Missing install script for previous commit Related:
 #RHEL-4343

Signed-off-by: Nicolas Frayer <nfrayer@redhat.com>
---
 20-grub.install | 6 +++++-
 grub2.spec      | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/20-grub.install b/20-grub.install
index 9b74538c..dd2018aa 100755
--- a/20-grub.install
+++ b/20-grub.install
@@ -109,7 +109,11 @@ case "$COMMAND" in
                 sed -i -e "s,^initrd.*,initrd ${BOOTPREFIX}${INITRD},g" "${BLS_TARGET}"
             fi
 
-            if [[ "$KERNEL_VERSION" == *\+* ]] && [ "x$GRUB_DEFAULT_TO_DEBUG" != "xtrue" ]; then
+            if ( [[ "$KERNEL_VERSION" != *${GRUB_DEFAULT_KERNEL_TYPE}* ]] && \
+                     [ "x$GRUB_NON_STANDARD_KERNEL" == "xtrue" ] ) || \
+                   ( echo "$KERNEL_VERSION" | grep -E -q "64k|auto|rt|uki" && \
+                    	[ "x$GRUB_NON_STANDARD_KERNEL" != "xtrue" ] ) || \
+                   ( [[ "$KERNEL_VERSION" == *debug* ]] && [ "x$GRUB_DEFAULT_TO_DEBUG" != "xtrue" ] ); then
                 GRUB_UPDATE_DEFAULT_KERNEL=false
             fi
 
diff --git a/grub2.spec b/grub2.spec
index a45d46ec..540543be 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -7,7 +7,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.02
-Release:	153%{?dist}
+Release:	154%{?dist}
 Summary:	Bootloader with support for Linux, Multiboot and more
 Group:		System Environment/Base
 License:	GPLv3+
@@ -510,6 +510,10 @@ fi
 %endif
 
 %changelog
+* Mon Nov 27 2023 Nicolas Frayer <nfrayer@redhat.com> - 2.02-154
+- Missing install script for previous commit
+- Related: #RHEL-4343
+
 * Fri Nov 24 2023 Nicolas Frayer <nfrayer@redhat.com> - 2.02-153
 - util: Enable default kernel for updates
 - Resolves: #RHEL-4343