From owner-svn-src-all@FreeBSD.ORG  Fri Oct 31 00:52:31 2008
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D17941065676;
	Fri, 31 Oct 2008 00:52:31 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BE34E8FC22;
	Fri, 31 Oct 2008 00:52:31 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9V0qVLK065965;
	Fri, 31 Oct 2008 00:52:31 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9V0qV0F065963;
	Fri, 31 Oct 2008 00:52:31 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <200810310052.m9V0qV0F065963@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Fri, 31 Oct 2008 00:52:31 +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: r184490 - head/sys/boot/powerpc/boot1.chrp
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Oct 2008 00:52:31 -0000

Author: nwhitehorn
Date: Fri Oct 31 00:52:31 2008
New Revision: 184490
URL: http://svn.freebsd.org/changeset/base/184490

Log:
  Modify our boot block to pick an output device, without which boot1 will fail
  on G4 machines. On the assumption that most people using FreeBSD on Apple
  hardware are not using serial consoles, set boot1's output to screen. This
  should be revisited. While here, reduce verbosity of boot1.

Modified:
  head/sys/boot/powerpc/boot1.chrp/boot1.c
  head/sys/boot/powerpc/boot1.chrp/bootinfo.txt

Modified: head/sys/boot/powerpc/boot1.chrp/boot1.c
==============================================================================
--- head/sys/boot/powerpc/boot1.chrp/boot1.c	Thu Oct 30 23:09:19 2008	(r184489)
+++ head/sys/boot/powerpc/boot1.chrp/boot1.c	Fri Oct 31 00:52:31 2008	(r184490)
@@ -561,6 +561,10 @@ printf(const char *fmt, ...)
 	va_list ap;
 	int ret;
 
+	/* Don't annoy the user as we probe for partitions */
+	if (strcmp(fmt,"Not ufs\n") == 0)
+		return 0;
+
 	va_start(ap, fmt);
 	ret = vprintf(fmt, ap);
 	va_end(ap);

Modified: head/sys/boot/powerpc/boot1.chrp/bootinfo.txt
==============================================================================
--- head/sys/boot/powerpc/boot1.chrp/bootinfo.txt	Thu Oct 30 23:09:19 2008	(r184489)
+++ head/sys/boot/powerpc/boot1.chrp/bootinfo.txt	Fri Oct 31 00:52:31 2008	(r184490)
@@ -7,6 +7,7 @@
 MacRISC MacRISC3 MacRISC4
 </COMPATIBLE>
 <BOOT-SCRIPT>
+" screen" output
 boot &device;:&partition;,\ppc\boot1.elf
 </BOOT-SCRIPT>
 </CHRP-BOOT>