!31 [sync] PR-30: fix kernel not found because grub.cfg using BLS format

From: @openeuler-sync-bot
Reviewed-by: @t_feng,@t_feng
Signed-off-by: @t_feng,@t_feng
This commit is contained in:
openeuler-ci-bot 2021-02-22 21:08:05 +08:00 committed by Gitee
commit 58c7ce68a8

View File

@ -7,7 +7,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 2.04 Version: 2.04
Release: 5 Release: 8
Summary: Bootloader with support for Linux, Multiboot and more Summary: Bootloader with support for Linux, Multiboot and more
License: GPLv3+ License: GPLv3+
URL: http://www.gnu.org/software/grub/ URL: http://www.gnu.org/software/grub/
@ -301,8 +301,9 @@ fi
%posttrans tools %posttrans tools
if [ -f /etc/default/grub ]; then if [ -f /etc/default/grub ]; then
! grep -q '^GRUB_ENABLE_BLSCFG=.*' /etc/default/grub && \ if grep -q '^GRUB_ENABLE_BLSCFG=.*' /etc/default/grub; then
/sbin/grub2-switch-to-blscfg --backup-suffix=.rpmsave &>/dev/null || : sed -i '/GRUB_ENABLE_BLSCFG=/d' /etc/default/grub
fi
fi fi
%triggerun -- grub2 < 1:1.99-4 %triggerun -- grub2 < 1:1.99-4
@ -447,7 +448,19 @@ rm -r /boot/grub2.tmp/ || :
%{_datadir}/man/man* %{_datadir}/man/man*
%changelog %changelog
* Fri Nov 13 2020 zhangqiumiao <zhangqiumiao1@huawei.com> - 2.04-5 * Mon Feb 22 2021 zhangqiumiao <zhangqiumiao1@huawei.com> - 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 <zhangqiumiao1@huawei.com> - 2.04-7
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:remove duplicate rpm-devel in BuildRequires
* Sat Nov 14 2020 zhangqiumiao <zhangqiumiao1@huawei.com> - 2.04-6
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA
- SUG:NA - SUG:NA