From bafcde937f7ff56bad9c4c291d91d1c952e6cfa7 Mon Sep 17 00:00:00 2001
From: Qiumiao Zhang <zhangqiumiao1@huawei.com>
Date: Mon, 22 Mar 2021 10:18:54 +0800
Subject: [PATCH] fix postun error in grub2-efi-x64

---
 grub.macros | 10 +++++-----
 grub2.spec  |  5 ++++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/grub.macros b/grub.macros
index 685a938..0fdd725 100644
--- a/grub.macros
+++ b/grub.macros
@@ -293,10 +293,10 @@ if [ "xvfat" != "x$res" -a "xfat" != "x$res" ]; then			\
 fi									\
 									\
 %postun %{1}								\
-if [ "x0" == "x$1" ];then						\
+if [ "x0" == "x$1" ]; then						\
 	res=$(grub2-probe /boot)					\
-	if[ "xvfat" != "x$res" -a "xfat" != "x$res" ];then		\
-        	rm -f /boot/grub2/grubenv				\
+	if [ "xvfat" != "x$res" -a "xfat" != "x$res" ]; then		\
+		rm -f /boot/grub2/grubenv				\
 	fi								\
 fi									\
 									\
@@ -387,8 +387,8 @@ done								\
 	-p /EFI/%{efi_vendor} -d grub-core ${GRUB_MODULES}	\
 %{4}./grub-mkimage -O %{1} -o %{3}.orig				\\\
 	-p /EFI/BOOT -d grub-core ${GRUB_MODULES}		\
-install -m 700 %{2}.orig %{2}                                   \
-install -m 700 %{3}.orig %{3}                                   \
+install -m 700 %{2}.orig %{2}					\
+install -m 700 %{3}.orig %{3}					\
 %{nil}
 %else
 %define mkimage()						\
diff --git a/grub2.spec b/grub2.spec
index ef47881..33acf61 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -7,7 +7,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.04
-Release:	12
+Release:	13
 Summary:	Bootloader with support for Linux, Multiboot and more
 License:	GPLv3+
 URL:		http://www.gnu.org/software/grub/
@@ -445,6 +445,9 @@ rm -r /boot/grub2.tmp/ || :
 %{_datadir}/man/man*
 
 %changelog
+* Sun Mar 21 2021 orange-snn <songnannan2@huawei.com> - 2.04-13
+- fix postun error in grub2-efi-x64
+
 * Thu Mar 18 2021 yanglu <yanglu60@huawei.com> - 2.04-12
 - Type:cves
 - ID:CVE-2020-27779 CVE-2020-14372
-- 
Gitee