2008-11-12  Robert Millan  <address@hidden>

	* util/grub.d/00_header.in: Default input terminal to at_keyboard for
	i386-ieee1275, and default output terminal to vga_text on i386-pc.

Index: util/grub.d/00_header.in
===================================================================
--- util/grub.d/00_header.in	(revision 1910)
+++ util/grub.d/00_header.in	(working copy)
@@ -22,6 +22,8 @@ address@hidden@
 address@hidden@
 address@hidden@
 grub_prefix=`echo /boot/grub | sed ${transform}`
address@hidden@
address@hidden@
 
 . ${libdir}/grub/grub-mkconfig_lib
 
@@ -40,6 +42,18 @@ set default=${GRUB_DEFAULT}
 set timeout=${GRUB_TIMEOUT}
 EOF
 
+# Platform-specific overrides
+case ${target_cpu}-${platform} in
+  i386-ieee1275)
+    # AT keyboard is the only choice on OLPC anyway.
+    GRUB_TERMINAL_INPUT=${GRUB_TERMINAL_INPUT:-at_keyboard}
+  ;;
+  i386-pc)
+    # Garanteed to work (and sometimes avoids BIOS bugs)
+    GRUB_TERMINAL_OUTPUT=${GRUB_TERMINAL_OUTPUT:-vga_text}
+  ;;
+esac
+
 case ${GRUB_TERMINAL_INPUT}:${GRUB_TERMINAL_OUTPUT} in
   serial:* | *:serial)
     if ! test -e ${grub_prefix}/serial.mod ; then