From owner-svn-src-all@FreeBSD.ORG  Wed Jun 15 14:07:16 2011
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 8C2B8106572A;
	Wed, 15 Jun 2011 14:07:16 +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 7CB098FC17;
	Wed, 15 Jun 2011 14:07:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p5FE7GHv084941;
	Wed, 15 Jun 2011 14:07:16 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5FE7G8r084939;
	Wed, 15 Jun 2011 14:07:16 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201106151407.p5FE7G8r084939@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Wed, 15 Jun 2011 14:07:16 +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: r223109 - head/sys/boot/forth
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: Wed, 15 Jun 2011 14:07:16 -0000

Author: nwhitehorn
Date: Wed Jun 15 14:07:16 2011
New Revision: 223109
URL: http://svn.freebsd.org/changeset/base/223109

Log:
  Revert changes to this file in r222417. This unconditionally enabled the
  boot menu on all platforms, which breaks loader completely on at least
  powerpc for reasons that are not understood yet.
  
  Reviewed by:	Devin Teske

Modified:
  head/sys/boot/forth/loader.rc

Modified: head/sys/boot/forth/loader.rc
==============================================================================
--- head/sys/boot/forth/loader.rc	Wed Jun 15 13:10:37 2011	(r223108)
+++ head/sys/boot/forth/loader.rc	Wed Jun 15 14:07:16 2011	(r223109)
@@ -10,8 +10,5 @@ start
 \ Tests for password -- executes autoboot first if a password was defined
 check-password
 
-\ Load in the boot menu
-include /boot/beastie.4th
+\ Unless set otherwise, autoboot is automatic at this point
 
-\ Start the boot menu
-beastie-start