Date: Fri, 2 Sep 2011 19:29:38 +0000 (UTC) From: Jaakko Heinonen <jh@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r225353 - head/sys/boot/forth Message-ID: <201109021929.p82JTccS013068@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201109021929.p82JTccS013068>