From 00b39b1f32f409ab38c8188af955f029c28bdc83 Mon Sep 17 00:00:00 2001 From: Qiumiao Zhang Date: Mon, 22 Feb 2021 16:29:37 +0800 Subject: [PATCH] fix kernel not found because grub.cfg using BLS format (cherry picked from commit 296dcbc4952963300f1ee3fe06593ef63861a542) --- grub2.spec | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/grub2.spec b/grub2.spec index 573a3c6..e5e76bb 100644 --- a/grub2.spec +++ b/grub2.spec @@ -7,7 +7,7 @@ Name: grub2 Epoch: 1 Version: 2.04 -Release: 5 +Release: 8 Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -284,8 +284,9 @@ fi %posttrans tools if [ -f /etc/default/grub ]; then - ! grep -q '^GRUB_ENABLE_BLSCFG=.*' /etc/default/grub && \ - /sbin/grub2-switch-to-blscfg --backup-suffix=.rpmsave &>/dev/null || : + if grep -q '^GRUB_ENABLE_BLSCFG=.*' /etc/default/grub; then + sed -i '/GRUB_ENABLE_BLSCFG=/d' /etc/default/grub + fi fi %triggerun -- grub2 < 1:1.99-4 @@ -392,7 +393,13 @@ rm -r /boot/grub2.tmp/ || : %{_datadir}/man/man* %changelog -* Fri Nov 20 2020 quanhongfei - 2.04-5 +* Mon Feb 22 2021 zhangqiumiao - 2.04-8 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix kernel not found because grub.cfg using BLS format + +* Mon Nov 16 2020 zhangqiumiao - 2.04-7 - Type:bugfix - ID:NA - SUG:NA -- Gitee