From owner-svn-src-head@FreeBSD.ORG  Fri Sep  2 19:29:38 2011
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 40B5C106566C;
	Fri,  2 Sep 2011 19:29:38 +0000 (UTC) (envelope-from jh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 303698FC0A;
	Fri,  2 Sep 2011 19:29:38 +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 p82JTca2013071;
	Fri, 2 Sep 2011 19:29:38 GMT (envelope-from jh@svn.freebsd.org)
Received: (from jh@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p82JTccS013068;
	Fri, 2 Sep 2011 19:29:38 GMT (envelope-from jh@svn.freebsd.org)
Message-Id: <201109021929.p82JTccS013068@svn.freebsd.org>
From: Jaakko Heinonen <jh@FreeBSD.org>
Date: Fri, 2 Sep 2011 19:29:38 +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: r225353 - head/sys/boot/forth
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, 02 Sep 2011 19:29:38 -0000

Author: jh
Date: Fri Sep  2 19:29:37 2011
New Revision: 225353
URL: http://svn.freebsd.org/changeset/base/225353

Log:
  Restore behavior of the autoboot_delay="-1" boot menu setting to the
  pre-r222417 state. The behavior was essentially reversed in r222417
  which can cause confusion.
  
  PR:		159775
  Submitted by:	Devin Teske
  Approved by:	re (kib)

Modified:
  head/sys/boot/forth/menu.4th
  head/sys/boot/forth/menu.4th.8

Modified: head/sys/boot/forth/menu.4th
==============================================================================
--- head/sys/boot/forth/menu.4th	Fri Sep  2 18:52:28 2011	(r225352)
+++ head/sys/boot/forth/menu.4th	Fri Sep  2 19:29:37 2011	(r225353)
@@ -742,11 +742,12 @@ create init_text8 255 allot
 			else
 				-rot 2drop
 
-				\ disable timeout if less than zero
+				\ boot immediately if less than zero
 				dup 0< if
 					drop
-					0 menu_timeout_enabled !
-					0 ( assigned to menu_timeout below )
+					menu-create
+					0 25 at-xy
+					0 boot
 				then
 			then
 		then

Modified: head/sys/boot/forth/menu.4th.8
==============================================================================
--- head/sys/boot/forth/menu.4th.8	Fri Sep  2 18:52:28 2011	(r225352)
+++ head/sys/boot/forth/menu.4th.8	Fri Sep  2 19:29:37 2011	(r225353)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 18, 2011
+.Dd Aug 29, 2011
 .Dt MENU.4TH 8
 .Os
 .Sh NAME
@@ -96,11 +96,15 @@ will wait before executing
 by default) unless a key is pressed.
 If set to
 .Dq Li NO
-(case-insensitive) or
-.Dq Li -1 ,
+(case-insensitive)
 .Ic menu-display
 will wait for user input and never execute
 .Ic menu_timeout_command .
+If set to
+.Dq Li -1 ,
+.Ic menu-display
+will boot immediately, preventing both interruption of the autoboot process and
+escaping to the loader prompt.
 Default is
 .Dq Li 10 .
 See