From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1L0KC6-0001eZ-UR for mharc-grub-devel@gnu.org; Wed, 12 Nov 2008 13:11:58 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L0KC5-0001eU-CL for grub-devel@gnu.org; Wed, 12 Nov 2008 13:11:57 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L0KC3-0001eI-VW for grub-devel@gnu.org; Wed, 12 Nov 2008 13:11:56 -0500 Received: from [199.232.76.173] (port=44468 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L0KC3-0001eF-Q8 for grub-devel@gnu.org; Wed, 12 Nov 2008 13:11:55 -0500 Received: from aybabtu.com ([69.60.117.155]:56811) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1L0KC3-0002R8-Nm for grub-devel@gnu.org; Wed, 12 Nov 2008 13:11:55 -0500 Received: from [192.168.10.10] (helo=thorin) by aybabtu.com with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1L0KAi-0000Gh-7O for grub-devel@gnu.org; Wed, 12 Nov 2008 19:10:32 +0100 Received: from rmh by thorin with local (Exim 4.63) (envelope-from ) id 1L0KBc-0002fQ-S4 for grub-devel@gnu.org; Wed, 12 Nov 2008 19:11:28 +0100 Date: Wed, 12 Nov 2008 19:11:28 +0100 From: Robert Millan To: grub-devel@gnu.org Message-ID: <20081112181128.GA10129@thorin> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="gKMricLos+KVdGMg" Content-Disposition: inline Organization: free as in freedom X-Message-Flag: Worried about Outlook viruses? Switch to Thunderbird! www.mozilla.com/thunderbird X-Debbugs-No-Ack: true User-Agent: Mutt/1.5.13 (2006-08-11) X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [PATCH] default terminals on i386-pc / i386-ieee1275 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Nov 2008 18:11:57 -0000 --gKMricLos+KVdGMg Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi, I think it would be good to make at_keyboard the default input terminal on i386-ieee1275, after the kernel has loaded (via grub-mkconfig). The AT keyboard is the only choice on OLPC anyway, and avoids ofconsole bugs (this used to be the old behaviour before the terminal split). Also, I think it would be good to make vga_text the default output terminal on i386-pc, provided that gfxterm auto-setup (in grub-mkconfig.in) wasn't possible. BIOS output is occasionally buggy (seen in a recent thread), and this way we avoid problems. See attached patch. -- Robert Millan The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and how) you may access your data; but nobody's threatening your freedom: we still allow you to remove your data and not access it at all." --gKMricLos+KVdGMg Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="mkconfig_defaults.diff" 2008-11-12 Robert Millan * 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 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ grub_prefix=`echo /boot/grub | sed ${transform}` +target_cpu=@target_cpu@ +platform=@platform@ . ${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 --gKMricLos+KVdGMg--