diff --git a/grub.macros b/grub.macros
index dbd7ea765e5307a52b2d9877ef4accfe38debbbf..78e0c25afad32c66a8085ec6f9eae710ae6b105c 100644
--- a/grub.macros
+++ b/grub.macros
@@ -360,7 +360,6 @@ PYTHON=python3 ./autogen.sh                 \
     --target=%{1}                       \\\
     --with-grubdir=%{name}                  \\\
     --program-transform-name=s,grub,%{name},        \\\
-    --disable-grub-mount                    \\\
     --disable-werror || ( cat config.log ; exit 1 )     \
 git add .							\
 git commit -m "After efi configure"				\
@@ -449,7 +448,6 @@ cd grub-%{1}-%{tarversion}					\
     --target=%{_target_platform}                \\\
     --with-grubdir=%{name}                  \\\
     --program-transform-name=s,grub,%{name},        \\\
-    --disable-grub-mount                    \\\
     --disable-werror || ( cat config.log ; exit 1 )     \
 git add .							\
 git commit -m "After legacy configure"				\
diff --git a/grub2.spec b/grub2.spec
index 6ffded2ae34e15a5ee475b6c6b0c49e0279233d5..7c2c5119620d1c234821a33d1dee8bdaece3dad7 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -8,7 +8,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.04
-Release:	17
+Release:	18
 Summary:	Bootloader with support for Linux, Multiboot and more
 License:	GPLv3+
 URL:		http://www.gnu.org/software/grub/
@@ -30,7 +30,7 @@ Source12:       installkernel.in
 BuildRequires:  gcc efi-srpm-macros flex bison binutils python3 ncurses-devel xz-devel
 BuildRequires:  freetype-devel libusb-devel bzip2-devel rpm-devel rpm-libs
 BuildRequires:  autoconf automake autogen device-mapper-devel freetype-devel git
-BuildRequires:  texinfo gettext-devel dejavu-sans-fonts help2man systemd
+BuildRequires:  texinfo gettext-devel dejavu-sans-fonts help2man systemd fuse-devel
 
 %ifarch %{golang_arches}
 BuildRequires:	pesign >= 0.99-8
@@ -221,6 +221,7 @@ cat << EOF > grub2.conf
 # these have execstack, and break under selinux
 -b /usr/bin/grub2-script-check
 -b /usr/bin/grub2-mkrelpath
+-b /usr/bin/grub2-mount
 -b /usr/bin/grub2-fstest
 -b /usr/sbin/grub2-bios-setup
 -b /usr/sbin/grub2-probe
@@ -402,6 +403,7 @@ rm -r /boot/grub2.tmp/ || :
 %{_sbindir}/%{name}-set-default
 %{_bindir}/%{name}-editenv
 %{_bindir}/%{name}-mkpasswd-pbkdf2
+%{_bindir}/%{name}-mount
 
 %files tools-extra
 %defattr(-,root,root)
@@ -449,6 +451,12 @@ rm -r /boot/grub2.tmp/ || :
 %{_datadir}/man/man*
 
 %changelog
+* Tue May 25 2021 yanan <yanan@huawei.com> - 2.04-18
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:delete the Symbolic Link of grubenv in grub2-efi-x64 and grub-efi-aa64 packages
+
 * Tue May 18 2021 zhangqiumiao <zhangqiumiao1@huawei.com> - 2.04-17
 - Type:bugfix
 - ID:NA