packages/grub2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!55 [sync] PR-48: fix the installation failure of grub2-efi-x64/grub2-efi-aa64 package on the /boot partition of VFAT file system

Browse Source 
From: @openeuler-sync-bot
Reviewed-by: @orange-snn
Signed-off-by: @orange-snn
This commit is contained in:
openeuler-ci-bot 2021-03-18 15:37:05 +08:00 committed by Gitee
commit 36d5a4cab7
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
grub.macros
View File

@ -277,6 +277,8 @@ Requires: %{name}-common = %{evr} \
Requires: %{name}-tools-minimal >= %{evr} \
Requires: %{name}-tools-extra = %{evr} \
Requires: %{name}-tools = %{evr} \
Requires(pre): %{name}-tools = %{evr} \
Requires(postun): %{name}-tools = %{evr} \
Provides: %{name}-efi = %{evr} \
%{?legacy_provides:Provides: %{name} = %{evr}} \
%{-o:Obsoletes: %{name}-efi < %{evr}} \
@ -284,6 +286,19 @@ Provides: %{name}-efi = %{evr} \
%{expand:%%description %{1}} \
%{desc} \
This subpackage provides support for %{1} systems. \
%pre %{1} \
res=$(grub2-probe /boot) \
if [ "xvfat" != "x$res" -a "xfat" != "x$res" ]; then \
ln -sf ../efi/EFI/%{efi_vendor}/grubenv /boot/grub2/grubenv \
fi \
\
%postun %{1} \
if [ "x0" == "x$1" ];then \
res=$(grub2-probe /boot) \
if[ "xvfat" != "x$res" -a "xfat" != "x$res" ];then \
rm -f /boot/grub2/grubenv \
fi \
fi \
\
%{expand:%%{?!buildsubdir:%%define buildsubdir grub-%{1}-%{tarversion}}}\
%{expand:%if 0%{?with_efi_modules} \

15
grub2.spec
View File

@ -7,7 +7,7 @@
Name: grub2
Epoch: 1
Version: 2.04
Release: 10
Release: 12
Summary: Bootloader with support for Linux, Multiboot and more
License: GPLv3+
URL: http://www.gnu.org/software/grub/
@ -448,6 +448,19 @@ rm -r /boot/grub2.tmp/ || :
%{_datadir}/man/man*
%changelog
* Wed Mar 17 2021 zhangqiumiao <zhangqiumiao1@huawei.com> - 2.04-12
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:fix the installation failure of grub2-efi-x64/grub-efi-aa64 packages on
the /boot partition of VFAT file system.
* Tue Mar 62 2021 hanhui <hanhui15@huawei.com> - 2.04-11
- Type:cves
- Id:CVE-2020-27779 CVE-2020-14372
- SUG:NA
- DESC:fix CVE-2020-27779 CVE-2020-14372
* Fri Mar 12 2021 yanglu <yanglu60@huawei.com> - 2.04-10
- Type:cves
- Id:CVE-2020-25632 CVE-2020-25647 CVE-2020-27749 CVE-2021-20225 CVE-2021-20233