From 963a16ff09e73d72dfa0fac8b703a1c998e909b4 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Aug 17 2017 20:13:50 +0000
Subject: fix grubenv once more...


---

diff --git a/grub.macros b/grub.macros
index 0241be7..b2374c7 100644
--- a/grub.macros
+++ b/grub.macros
@@ -395,9 +395,6 @@ install -m 755 %{2} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{2}	\
 install -m 755 %{3} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{3} \
 install -D -m 644 unicode.pf2					\\\
 	$RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/fonts/unicode.pf2\
-ln -sf ../efi/EFI/%{efidir}/grubenv				\\\
-	$RPM_BUILD_ROOT/boot/grub2/grubenv			\
-./grub-editenv ${RPM_BUILD_ROOT}/boot/grub2/grubenv create	\
 cd ..								\
 %{nil}
 
@@ -412,7 +409,6 @@ if [ -f $RPM_BUILD_ROOT%{_infodir}/grub-dev.info ]; then	\
 fi								\
 ln -s ../boot/%{name}/grub.cfg					\\\
 	${RPM_BUILD_ROOT}%{_sysconfdir}/grub2.cfg		\
-./grub-editenv ${RPM_BUILD_ROOT}/boot/grub2/grubenv create	\
 cd ..								\
 if [ -f $RPM_BUILD_ROOT/%{_libdir}/grub/%{1}/grub2.chrp ]; then \
 	mv $RPM_BUILD_ROOT/%{_libdir}/grub/%{1}/grub2.chrp	\\\
@@ -439,6 +435,8 @@ install -d -m 0755 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig	\
 touch ${RPM_BUILD_ROOT}%{_sysconfdir}/default/grub		\
 ln -sf ../default/grub						\\\
 	${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/grub		\
+ln -sf ../efi/EFI/%{efidir}/grubenv				\\\
+	$RPM_BUILD_ROOT/boot/grub2/grubenv			\
 touch ${RPM_BUILD_ROOT}/boot/%{name}/grub.cfg			\
 %{nil}
 
diff --git a/grub2.spec b/grub2.spec
index e5c42b7..687fd29 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -198,6 +198,7 @@ rm -fr $RPM_BUILD_ROOT
 %if 0%{with_legacy_arch}
 %{expand:%do_legacy_install %%{grublegacyarch} %%{alt_grub_target_name}}
 %endif
+${RPM_BUILD_ROOT}/%{_bindir}/%{name}-editenv ${RPM_BUILD_ROOT}/boot/efi/EFI/%{efidir}/grubenv create
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 %find_lang grub