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

	* util/grub-mkconfig.in: Allow the user to specify the used font
	with GRUB_FONT.

diff --git a/ChangeLog b/ChangeLog
index 202e76b80c789a0e20d610f7c32322b239654243..cd782a2187f48b07d234f13d145d60a1fb62dd0e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-08  Felix Zielcke  <fzielcke@z-51.de>
+
+       * util/grub-mkconfig.in: Allow the user to specify the used font
+       with GRUB_FONT.
+
 2009-08-08  Pavel Roskin  <proski@gnu.org>
 
        * include/grub/powerpc/libgcc.h: Export __ashrdi3() if

diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 7756b492a4f7cebcd63fb69088d58d6bbea0d15a..f20c9de6939e0373636b343c690fa4c5f956d170 100644 (file)
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -154,21 +154,30 @@ esac
 # check for terminals that require fonts
 case ${GRUB_TERMINAL_OUTPUT} in
   gfxterm)
-    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}
+    if [ -n "$GRUB_FONT" ] ; then
+      if is_path_readable_by_grub ${GRUB_FONT} > /dev/null ; then
+        GRUB_FONT_PATH=${GRUB_FONT}
        else
-         continue
+         echo "No such font or not readable by grub: ${GRUB_FONT}" >&2
+         exit 1
        fi
-       if [ "${basename}" = "ascii" ] ; then
-         # make sure all our children behave in conformance with ascii..
-         export LANG=C
-       fi
-       break 2
+    else
+      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
-    done
+    fi
     if [ -z "${GRUB_FONT_PATH}" ] ; then
       # fallback to the native terminal for this platform
       unset GRUB_TERMINAL_OUTPUT