merge trunk

util/grub.d/00_header.in

@@ -84,11 +84,16 @@ if [ -n "${GRUB_VIDEO_BACKEND}" ]; then
 EOF
 else
     # Insert all available backends; GRUB will use the most appropriate.
+    have_video=0;
     for backend in $(cat "${GRUB_PREFIX}/video.lst"); do
+	have_video=1;
 	cat <<EOF
   insmod ${backend}
 EOF
     done
+    if [ x$have_video = x0 ]; then
+	echo "true"
+    fi
 fi
 cat <<EOF
 }
@@ -127,6 +132,19 @@ if loadfont `make_system_path_relative_to_its_root "${GRUB_FONT_PATH}"` ; then
   set gfxmode=${GRUB_GFXMODE}
   load_video
   insmod gfxterm
+EOF
+
+# Gettext variables and module
+if [ "x${LANG}" != "xC" ] && [ -d "${locale_dir}" ] ; then
+    prepare_grub_to_access_device $(${grub_probe} --target=device ${locale_dir}) | sed -e "s/^/  /"
+  cat << EOF
+  set locale_dir=(\$root)$(make_system_path_relative_to_its_root ${locale_dir})
+  set lang=${grub_lang}
+  insmod gettext
+EOF
+fi
+
+cat <<EOF
 fi
 EOF
 fi
@@ -205,16 +223,6 @@ EOF
     fi
 fi
 
-# Gettext variables and module
-if [ "x${LANG}" != "xC" ] && [ -d "${locale_dir}" ] ; then
-    prepare_grub_to_access_device $(${grub_probe} --target=device ${locale_dir})
-  cat << EOF
-set locale_dir=(\$root)$(make_system_path_relative_to_its_root ${locale_dir})
-set lang=${grub_lang}
-insmod gettext
-EOF
-fi
-
 make_timeout ()
 {
     if [ "x${1}" != "x" ] ; then