* util/grub.d/00_header.in: Don't use LANG unless unifont is available.

diff --git a/ChangeLog b/ChangeLog
index 891853f710b619a08727c907a5fee43b5463f0e0..bc93187011251d2db797542ac310aed6d82ce13f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-06  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/grub.d/00_header.in: Don't use LANG unless unifont is available.
+
 2011-04-06  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Output errors if theme loading failed.

diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 420b3f32cd535b965222b5e62d3ba96dc102414d..9da1511f5e48f3113f1eb257af31ba2729191547 100644 (file)
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -132,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
@@ -210,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