From fe6d0ed55fece9627979699eea34071aa3f71186 Mon Sep 17 00:00:00 2001
From: tigro <tigro@msvsphere-os.ru>
Date: Tue, 23 Jan 2024 21:08:03 +0300
Subject: [PATCH] Ignore bls.conf during adding new kernel

---
 SOURCES/20-grub.install | 10 +++-------
 SPECS/grub2.spec        |  5 ++++-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/SOURCES/20-grub.install b/SOURCES/20-grub.install
index 27d8a75..3b33998 100755
--- a/SOURCES/20-grub.install
+++ b/SOURCES/20-grub.install
@@ -93,13 +93,9 @@ case "$COMMAND" in
             [[ -d "$BLS_DIR" ]] || mkdir -m 0700 -p "$BLS_DIR"
             BLS_ID="${MACHINE_ID}-${KERNEL_VERSION}"
             BLS_TARGET="${BLS_DIR}/${BLS_ID}.conf"
-            if [[ -f "${KERNEL_DIR}/bls.conf" ]]; then
-                cp -aT "${KERNEL_DIR}/bls.conf" "${BLS_TARGET}" || exit $?
-            else
-                mkbls "${KERNEL_VERSION}" \
-                    "$(date -u +%Y%m%d%H%M%S -d "$(stat -c '%y' "${KERNEL_DIR}")")" \
-                    >"${BLS_TARGET}"
-            fi
+            mkbls "${KERNEL_VERSION}" \
+                "$(date -u +%Y%m%d%H%M%S -d "$(stat -c '%y' "${KERNEL_DIR}")")" \
+                >"${BLS_TARGET}"
 
             LINUX="$(grep '^linux[ \t]' "${BLS_TARGET}" | sed -e 's,^linux[ \t]*,,')"
             INITRD="$(grep '^initrd[ \t]' "${BLS_TARGET}" | sed -e 's,^initrd[ \t]*,,')"
diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec
index d7f32c1..622a207 100644
--- a/SPECS/grub2.spec
+++ b/SPECS/grub2.spec
@@ -11,7 +11,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.02
-Release:	150%{?dist}.inferit.1
+Release:	150%{?dist}.inferit.2
 Summary:	Bootloader with support for Linux, Multiboot and more
 Group:		System Environment/Base
 License:	GPLv3+
@@ -521,6 +521,9 @@ fi
 %endif
 
 %changelog
+* Tue Jan 23 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 2.02-150.inferit.2
+- Ignore bls.conf during adding new kernel
+
 * Fri Dec 22 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 2.02-150.inferit.1
 - Fix condition in Conflicts