vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
* util/grub-mkconfig.in: Allow the user to specify the used font
	with GRUB_FONT.
This commit is contained in:
fzielcke 2009-08-08 06:41:54 +00:00
parent b5f16cc4cf
commit a78c8d240b
2 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 2009-08-08 Pavel Roskin <proski@gnu.org>
* include/grub/powerpc/libgcc.h: Export __ashrdi3() if * include/grub/powerpc/libgcc.h: Export __ashrdi3() if

33
util/grub-mkconfig.in
View file

@ -154,21 +154,30 @@ esac
# check for terminals that require fonts # check for terminals that require fonts
case ${GRUB_TERMINAL_OUTPUT} in case ${GRUB_TERMINAL_OUTPUT} in
gfxterm) gfxterm)
for dir in ${pkgdatadir} /boot/grub /usr/share/grub ; do if [ -n "$GRUB_FONT" ] ; then
for basename in unicode unifont ascii; do if is_path_readable_by_grub ${GRUB_FONT} > /dev/null ; then
path="${dir}/${basename}.pf2" GRUB_FONT_PATH=${GRUB_FONT}
if is_path_readable_by_grub ${path} > /dev/null ; then
GRUB_FONT_PATH=${path}
else else
continue echo "No such font or not readable by grub: ${GRUB_FONT}" >&2
exit 1
fi fi
if [ "${basename}" = "ascii" ] ; then else
# make sure all our children behave in conformance with ascii.. for dir in ${pkgdatadir} /boot/grub /usr/share/grub ; do
export LANG=C for basename in unicode unifont ascii; do
fi path="${dir}/${basename}.pf2"
break 2 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
done fi
if [ -z "${GRUB_FONT_PATH}" ] ; then if [ -z "${GRUB_FONT_PATH}" ] ; then
# fallback to the native terminal for this platform # fallback to the native terminal for this platform
unset GRUB_TERMINAL_OUTPUT unset GRUB_TERMINAL_OUTPUT