From a1ea5139555a173a5a007577261d0f8d3ac0998b Mon Sep 17 00:00:00 2001
From: Qiumiao Zhang <zhangqiumiao1@huawei.com>
Date: Thu, 18 Mar 2021 09:46:41 +0800
Subject: [PATCH] fix the failure of grub2-efi-x64/grub2-efi-aa64 package on
 the /boot partition of VFAT file system

(cherry picked from commit 55cbe9dd35167f013818abb34bed9e36ff15ad0c)
---
 grub.macros | 15 +++++++++++++++
 grub2.spec  | 21 ++++++++++++++++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/grub.macros b/grub.macros
index aa6bfc0..685a938 100644
--- a/grub.macros
+++ b/grub.macros
@@ -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}					\
diff --git a/grub2.spec b/grub2.spec
index 5f92001..c009ab9 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -7,7 +7,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.04
-Release:	9
+Release:	12
 Summary:	Bootloader with support for Linux, Multiboot and more
 License:	GPLv3+
 URL:		http://www.gnu.org/software/grub/
@@ -445,6 +445,25 @@ 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
+- SUG:NA
+- DESC:fix CVE-2020-25632 CVE-2020-25647 CVE-2020-27749 CVE-2021-20225 CVE-2021-20233
+
 * Sat Feb 27 2021 fengtao <fengtao40@huawei.com> - 2.04-9
 - Type:bugfix
 - ID:NA
-- 
Gitee