Merge mainline into gfxmenu

util/grub.d/00_header.in

@@ -39,14 +39,24 @@ if [ "x${GRUB_TIMEOUT}" = "x" ] ; then GRUB_TIMEOUT=5 ; fi
 if [ "x${GRUB_GFXMODE}" = "x" ] ; then GRUB_GFXMODE=640x480 ; fi
 
 cat << EOF
-load_env
-set default=${GRUB_DEFAULT}
-if [ \${prev_saved_entry} ]; then
-  saved_entry=\${prev_saved_entry}
-  save_env saved_entry
-  prev_saved_entry=
-  save_env prev_saved_entry
+if [ -s \$prefix/grubenv ]; then
+  load_env
 fi
+set default="${GRUB_DEFAULT}"
+if [ \${prev_saved_entry} ]; then
+  set saved_entry=\${prev_saved_entry}
+  save_env saved_entry
+  set prev_saved_entry=
+  save_env prev_saved_entry
+  set boot_once=true
+fi
+
+function savedefault {
+  if [ -z \${boot_once} ]; then
+    saved_entry=\${chosen}
+    save_env saved_entry
+  fi
+}
 EOF
 
 case ${GRUB_TERMINAL_INPUT}:${GRUB_TERMINAL_OUTPUT} in
@@ -124,8 +134,9 @@ esac
 
 # Gettext variables and module
 if [ "x${LANG}" != "xC" ] ; then
+    prepare_grub_to_access_device $(${grub_probe} --target=device ${locale_dir})
   cat << EOF
-set locale_dir=${locale_dir}
+set locale_dir=(\$root)$(make_system_path_relative_to_its_root ${locale_dir})
 set lang=${grub_lang}
 insmod gettext
 EOF