From owner-svn-src-projects@FreeBSD.ORG Tue Sep 6 01:42:49 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E1EF71065672; Tue, 6 Sep 2011 01:42:49 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B7E448FC13; Tue, 6 Sep 2011 01:42:49 +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 p861gnGY062653; Tue, 6 Sep 2011 01:42:49 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p861gnXc062649; Tue, 6 Sep 2011 01:42:49 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201109060142.p861gnXc062649@svn.freebsd.org> From: Marcel Moolenaar Date: Tue, 6 Sep 2011 01:42:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225410 - in projects/altix/sys/boot: common forth X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Sep 2011 01:42:50 -0000 Author: marcel Date: Tue Sep 6 01:42:49 2011 New Revision: 225410 URL: http://svn.freebsd.org/changeset/base/225410 Log: Fixup sync with head@225405 Modified: projects/altix/sys/boot/common/util.c projects/altix/sys/boot/forth/menu.4th projects/altix/sys/boot/forth/menu.4th.8 Modified: projects/altix/sys/boot/common/util.c ============================================================================== --- projects/altix/sys/boot/common/util.c Tue Sep 6 01:40:45 2011 (r225409) +++ projects/altix/sys/boot/common/util.c Tue Sep 6 01:42:49 2011 (r225410) @@ -119,7 +119,7 @@ printf(const char *fmt, ...) { va_list ap; const char *hex = "0123456789abcdef"; - char buf[10], *s; + char buf[32], *s; unsigned long long u; int c, l; Modified: projects/altix/sys/boot/forth/menu.4th ============================================================================== --- projects/altix/sys/boot/forth/menu.4th Tue Sep 6 01:40:45 2011 (r225409) +++ projects/altix/sys/boot/forth/menu.4th Tue Sep 6 01:42:49 2011 (r225410) @@ -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: projects/altix/sys/boot/forth/menu.4th.8 ============================================================================== --- projects/altix/sys/boot/forth/menu.4th.8 Tue Sep 6 01:40:45 2011 (r225409) +++ projects/altix/sys/boot/forth/menu.4th.8 Tue Sep 6 01:42:49 2011 (r225410) @@ -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