--- /etc/grub.d/00_header.orig	2018-05-05 20:10:28.575545514 +0300
+++ /etc/grub.d/00_header	2018-05-05 19:55:45.525981568 +0300
@@ -23,6 +23,7 @@
 grub_lang=`echo $LANG | cut -d . -f 1`
 grubdir="`echo "/boot/grub" | sed 's,//*,/,g'`"
 quick_boot="1"
+grub_env_block="\${cmdpath}/grubenv"
 
 export TEXTDOMAIN=grub
 export TEXTDOMAINDIR="${datarootdir}/locale"
@@ -45,9 +46,9 @@
 if [ "x${GRUB_TIMEOUT_BUTTON}" = "x" ] ; then GRUB_TIMEOUT_BUTTON="$GRUB_TIMEOUT" ; fi
 
 cat << EOF
-if [ -s \${prefix}/grubenv ]; then
+if [ -s $grub_env_block ]; then
   set have_grubenv=true
-  load_env
+  load_env --file ${grub_env_block}
 fi
 EOF
 if [ "x$GRUB_BUTTON_CMOS_ADDRESS" != "x" ]; then
@@ -57,7 +58,7 @@
 elif [ "\${next_entry}" ] ; then
    set default="\${next_entry}"
    set next_entry=
-   save_env next_entry
+   save_env --file ${grub_env_block} next_entry
    set boot_once=true
 else
    set default="${GRUB_DEFAULT}"
@@ -68,7 +69,7 @@
 if [ "\${next_entry}" ] ; then
    set default="\${next_entry}"
    set next_entry=
-   save_env next_entry
+   save_env --file ${grub_env_block} next_entry
    set boot_once=true
 else
    set default="${GRUB_DEFAULT}"
@@ -87,16 +88,16 @@
 
 if [ "\${prev_saved_entry}" ]; then
   set saved_entry="\${prev_saved_entry}"
-  save_env saved_entry
+  save_env --file ${grub_env_block} saved_entry
   set prev_saved_entry=
-  save_env prev_saved_entry
+  save_env --file ${grub_env_block} prev_saved_entry
   set boot_once=true
 fi
 
 function savedefault {
   if [ -z "\${boot_once}" ]; then
     saved_entry="\${chosen}"
-    save_env saved_entry
+    save_env --file ${grub_env_block} saved_entry
   fi
 }
 EOF
@@ -131,7 +132,7 @@
     esac
 
     cat <<EOF
-  if [ -n "\${have_grubenv}" ]; then if [ -z "\${boot_once}" ]; then save_env recordfail; fi; fi
+  if [ -n "\${have_grubenv}" ]; then if [ -z "\${boot_once}" ]; then save_env --file ${grub_env_block} recordfail; fi; fi
 EOF
   }