2009-08-08  Felix Zielcke  <address@hidden>

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

Index: util/grub-mkconfig.in
===================================================================
--- util/grub-mkconfig.in	(revision 2482)
+++ util/grub-mkconfig.in	(working copy)
@@ -154,6 +154,14 @@ esac
 # check for terminals that require fonts
 case ${GRUB_TERMINAL_OUTPUT} in
   gfxterm)
+    if [ -n "$GRUB_FONT" ] ; then
+      if is_path_readable_by_grub ${GRUB_FONT} > /dev/null ; then
+        GRUB_FONT_PATH=${GRUB_FONT}
+	else
+	  echo "No such font or not readable by grub: ${GRUB_FONT}" >&2
+	  exit 1
+	fi
+    else
     for dir in ${pkgdatadir} /boot/grub /usr/share/grub ; do
       for basename in unicode unifont ascii; do
 	path="${dir}/${basename}.pf2"
@@ -169,6 +177,7 @@ case ${GRUB_TERMINAL_OUTPUT} in
 	break 2
       done
     done
+    fi
     if [ -z "${GRUB_FONT_PATH}" ] ; then
       # fallback to the native terminal for this platform
       unset GRUB_TERMINAL_OUTPUT