From a78c8d240bbb261b3c93732835e59d54557f470d Mon Sep 17 00:00:00 2001 From: fzielcke Date: Sat, 8 Aug 2009 06:41:54 +0000 Subject: [PATCH] 2009-08-08 Felix Zielcke * util/grub-mkconfig.in: Allow the user to specify the used font with GRUB_FONT. --- ChangeLog | 5 +++++ util/grub-mkconfig.in | 33 +++++++++++++++++++++------------ 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 202e76b80..cd782a218 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-08-08 Felix Zielcke + + * util/grub-mkconfig.in: Allow the user to specify the used font + with GRUB_FONT. + 2009-08-08 Pavel Roskin * include/grub/powerpc/libgcc.h: Export __ashrdi3() if diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in index 7756b492a..f20c9de69 100644 --- 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