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

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

Browse source 
* util/grub.d/00_header.in: Move check for the video backend of
	gfxterm from here ...
	* util/grub-mkconfig.in: ... to here.  Enable gfxterm if there's
	a suitable video backend.
This commit is contained in:
fzielcke 2009-08-25 19:42:56 +00:00
parent aea664ea28
commit 3b76e68ba7
3 changed files with 28 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

22
util/grub-mkconfig.in
View file

@ -141,7 +141,24 @@ if [ "x${GRUB_TERMINAL}" != "x" ] ; then
fi
case x${GRUB_TERMINAL_OUTPUT} in
x | xconsole | xserial | xofconsole | xgfxterm) ;;
x | xgfxterm)
# If this platform supports gfxterm, try to use it.
if test -e ${grub_prefix}/gfxterm.mod ; then
GRUB_VIDEO_BACKEND=
for i in vbe ; do
if test -e ${grub_prefix}/$i.mod ; then
GRUB_VIDEO_BACKEND=$i
break
fi
done
if [ -n "${GRUB_VIDEO_BACKEND}" ] ; then
GRUB_TERMINAL_OUTPUT=gfxterm
elif [ "${GRUB_TERMINAL_OUTPUT}" = "gfxterm" ] ; then
echo "No suitable backend could be found for gfxterm." >&2 ; exit 1
fi
fi
;;
xconsole | xserial | xofconsole) ;;
*) echo "Invalid output terminal \"${GRUB_TERMINAL_OUTPUT}\"" >&2 ; exit 1 ;;
esac
@ -190,7 +207,8 @@ export GRUB_DEVICE \
GRUB_DEVICE_BOOT_UUID \
GRUB_FS \
GRUB_FONT_PATH \
GRUB_PRELOAD_MODULES
GRUB_PRELOAD_MODULES \
GRUB_VIDEO_BACKEND
# These are optional, user-defined variables.
export GRUB_DEFAULT \