2008-02-03 Robert Millan <rmh@aybabtu.com>
* util/grub.d/00_header.in: Issue scripting commands for GRUB to only setup gfxterm when `font' command has succeeded.
This commit is contained in:
parent
d42b36722f
commit
3b3f662905
2 changed files with 15 additions and 9 deletions
|
@ -1,3 +1,8 @@
|
|||
2008-02-03 Robert Millan <rmh@aybabtu.com>
|
||||
|
||||
* util/grub.d/00_header.in: Issue scripting commands for GRUB to
|
||||
only setup gfxterm when `font' command has succeeded.
|
||||
|
||||
2008-02-03 Robert Millan <rmh@aybabtu.com>
|
||||
|
||||
* loader/multiboot_loader.c [GRUB_MACHINE_LINUXBIOS]
|
||||
|
|
|
@ -42,15 +42,14 @@ if [ "x${GRUB_DRIVE}" = "x" ] ; then : ; else
|
|||
echo "set root=${GRUB_DRIVE}"
|
||||
fi
|
||||
|
||||
if [ "x${GRUB_FONT_PATH}" = "x" ] ; then : ; else
|
||||
echo "font ${GRUB_FONT_PATH}"
|
||||
fi
|
||||
|
||||
case ${platform}:${GRUB_TERMINAL} in
|
||||
pc:gfxterm) cat << EOF
|
||||
set gfxmode=640x480
|
||||
insmod gfxterm
|
||||
insmod vbe
|
||||
if font ${GRUB_FONT_PATH} ; then
|
||||
set gfxmode=640x480
|
||||
insmod gfxterm
|
||||
insmod vbe
|
||||
terminal gfxterm
|
||||
fi
|
||||
EOF
|
||||
;;
|
||||
*:serial)
|
||||
|
@ -59,7 +58,9 @@ EOF
|
|||
GRUB_SERIAL_COMMAND=serial
|
||||
fi
|
||||
echo "${GRUB_SERIAL_COMMAND}"
|
||||
echo "terminal serial"
|
||||
;;
|
||||
*:*)
|
||||
echo "terminal ${GRUB_TERMINAL}"
|
||||
;;
|
||||
esac
|
||||
|
||||
echo "terminal ${GRUB_TERMINAL}"
|
||||
|
|
Loading…
Reference in a new issue