From owner-svn-src-head@FreeBSD.ORG  Fri Mar 26 01:30:54 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5E7671065670;
	Fri, 26 Mar 2010 01:30:54 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 32EA78FC18;
	Fri, 26 Mar 2010 01:30:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2Q1UsVW095280;
	Fri, 26 Mar 2010 01:30:54 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2Q1Usjd095276;
	Fri, 26 Mar 2010 01:30:54 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201003260130.o2Q1Usjd095276@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Fri, 26 Mar 2010 01:30:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r205662 - in head/sys/boot/i386: boot2 gptboot zfsboot
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Mar 2010 01:30:54 -0000

Author: delphij
Date: Fri Mar 26 01:30:53 2010
New Revision: 205662
URL: http://svn.freebsd.org/changeset/base/205662

Log:
  Our boot loader is capable of booting both i386 and amd64 kernels so
  call it "x86" instead of "i386".
  
  Suggested by:	jhb in response to Alexander Best's loader proposal
  MFC after:	1 month

Modified:
  head/sys/boot/i386/boot2/boot2.c
  head/sys/boot/i386/gptboot/gptboot.c
  head/sys/boot/i386/zfsboot/zfsboot.c

Modified: head/sys/boot/i386/boot2/boot2.c
==============================================================================
--- head/sys/boot/i386/boot2/boot2.c	Fri Mar 26 01:19:29 2010	(r205661)
+++ head/sys/boot/i386/boot2/boot2.c	Fri Mar 26 01:30:53 2010	(r205662)
@@ -283,7 +283,7 @@ main(void)
 
     for (;;) {
 	if (!autoboot || !OPT_CHECK(RBX_QUIET))
-	    printf("\nFreeBSD/i386 boot\n"
+	    printf("\nFreeBSD/x86 boot\n"
 		   "Default: %u:%s(%u,%c)%s\n"
 		   "boot: ",
 		   dsk.drive & DRV_MASK, dev_nm[dsk.type], dsk.unit,

Modified: head/sys/boot/i386/gptboot/gptboot.c
==============================================================================
--- head/sys/boot/i386/gptboot/gptboot.c	Fri Mar 26 01:19:29 2010	(r205661)
+++ head/sys/boot/i386/gptboot/gptboot.c	Fri Mar 26 01:30:53 2010	(r205662)
@@ -281,7 +281,7 @@ main(void)
 
     for (;;) {
 	if (!autoboot || !OPT_CHECK(RBX_QUIET))
-	    printf("\nFreeBSD/i386 boot\n"
+	    printf("\nFreeBSD/x86 boot\n"
 		   "Default: %u:%s(%up%u)%s\n"
 		   "boot: ",
 		   dsk.drive & DRV_MASK, dev_nm[dsk.type], dsk.unit,

Modified: head/sys/boot/i386/zfsboot/zfsboot.c
==============================================================================
--- head/sys/boot/i386/zfsboot/zfsboot.c	Fri Mar 26 01:19:29 2010	(r205661)
+++ head/sys/boot/i386/zfsboot/zfsboot.c	Fri Mar 26 01:30:53 2010	(r205662)
@@ -730,7 +730,7 @@ main(void)
 
     for (;;) {
 	if (!autoboot || !OPT_CHECK(RBX_QUIET))
-	    printf("\nFreeBSD/i386 boot\n"
+	    printf("\nFreeBSD/x86 boot\n"
 		   "Default: %s:%s\n"
 		   "boot: ",
 		   spa->spa_name, kname);