2009-08-07 Felix Zielcke <fzielcke@z-51.de>

	* util/grub-mkconfig_lib.in (font_path): Move the functionality
	of it to ...
	* util/grub-mkconfig.in: ... here.  Prefer unicode.pf2 and
	unifont.pf2 over ascii.pf2.  Export LANG=C in case ascii.pf2 gets used.

diff --git a/ChangeLog b/ChangeLog
index 78a212ff11cf0ef2cb07f3a86a3707e524ef54cc..b149b540c454e38faa01bed4c55be62df34fe003 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-08-07  Felix Zielcke  <fzielcke@z-51.de>
+
+       * util/grub-mkconfig_lib.in (font_path): Move the functionality
+       of it to ...
+       * util/grub-mkconfig.in: ... here.  Prefer unicode.pf2 and
+       unifont.pf2 over ascii.pf2.  Export LANG=C in case ascii.pf2 gets used.
+
 2009-08-07  Robert Millan  <rmh.grub@aybabtu.com>
 
        * util/grub.d/10_linux.in (test_numeric): Moved from here ...

diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 75a07e6980fe5a1672c6916b674a39c5b38f2d23..98726f144d02eb7d23855778b585d70a1a020b47 100644 (file)
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -24,6 +24,8 @@ sbindir=@sbindir@
 libdir=@libdir@
 sysconfdir=@sysconfdir@
 package_version=@PACKAGE_VERSION@
+datadir=@datadir@
+pkgdatadir=${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`
 grub_prefix=`echo /boot/grub | sed ${transform}`
 grub_cfg=""
 grub_mkconfig_dir=${sysconfdir}/grub.d
@@ -151,22 +153,30 @@ esac
 # check for terminals that require fonts
 case ${GRUB_TERMINAL_OUTPUT} in
   gfxterm)
-    if path=`font_path` ; then
-      GRUB_FONT_PATH="${path}"
-    else
-      # fallback to the native terminal for this platform
-      unset GRUB_TERMINAL_OUTPUT
+    for dir in ${pkgdatadir} /boot/grub /usr/share/grub ; do
+      for basename in unicode unifont ascii; do
+       path="${dir}/${basename}.pf2"
+        if is_path_readable_by_grub ${path} > /dev/null ; then
+         GRUB_FONT_PATH=${path}
+       else
+         continue
+       fi
+       if [ "${basename}" = "ascii"] ; then
+         # make sure all our children behave in conformance with ascii..
+         export LANG=C
+       fi
+       break 2
+      done
+    done
+      if [ -z "${GRUB_FONT_PATH}" ] ; then
+        # fallback to the native terminal for this platform
+        unset GRUB_TERMINAL_OUTPUT
+      fi
     fi
   ;;
-esac
-
-# does our terminal support utf-8 ?
-case ${GRUB_TERMINAL_OUTPUT} in
-  gfxterm) ;;
   *)
     # make sure all our children behave in conformance with ascii..
     export LANG=C
-  ;;
 esac
 
 # These are defined in this script, export them here so that user can

diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index 52dac00fe933c3242599bc51cdf5b9d22d890f30..99b3c9c6f26fcc99f2ed25347b01ecfd3fb58cbd 100644 (file)
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -148,23 +148,6 @@ prepare_grub_to_access_device ()
   fi
 }
 
-font_path ()
-{
-  for dir in ${pkgdatadir} /boot/grub /usr/share/grub ; do
-    # FIXME: We prefer ascii because loading complete fonts is too slow (and
-    # we don't yet provide the gettext magic that would make unicode useful).
-    for basename in ascii unicode unifont ; do
-      path="${dir}/${basename}.pf2"
-      if is_path_readable_by_grub ${path} > /dev/null ; then
-        echo "${path}"
-        return 0
-      fi
-    done
-  done
-
-  return 1
-}
-
 grub_file_is_not_garbage ()
 {
   if test -f "$1" ; then