From owner-svn-src-head@freebsd.org  Mon Dec 14 00:46:24 2020
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9EF3E4A91AC;
 Mon, 14 Dec 2020 00:46:24 +0000 (UTC)
 (envelope-from jrtc27@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4CvN4J46sDz3j59;
 Mon, 14 Dec 2020 00:46:24 +0000 (UTC)
 (envelope-from jrtc27@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 805CA18EC3;
 Mon, 14 Dec 2020 00:46:24 +0000 (UTC)
 (envelope-from jrtc27@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BE0kOtb041297;
 Mon, 14 Dec 2020 00:46:24 GMT (envelope-from jrtc27@FreeBSD.org)
Received: (from jrtc27@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BE0kOnC041296;
 Mon, 14 Dec 2020 00:46:24 GMT (envelope-from jrtc27@FreeBSD.org)
Message-Id: <202012140046.0BE0kOnC041296@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jrtc27 set sender to
 jrtc27@FreeBSD.org using -f
From: Jessica Clarke <jrtc27@FreeBSD.org>
Date: Mon, 14 Dec 2020 00:46:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r368623 - head/stand/common
X-SVN-Group: head
X-SVN-Commit-Author: jrtc27
X-SVN-Commit-Paths: head/stand/common
X-SVN-Commit-Revision: 368623
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Dec 2020 00:46:24 -0000

Author: jrtc27
Date: Mon Dec 14 00:46:24 2020
New Revision: 368623
URL: https://svnweb.freebsd.org/changeset/base/368623

Log:
  loader: Print autoboot countdown immediately, not at 9
  
  For the first second otime and ntime are equal so no message gets
  printed. Instead we should print the countdown right from the start,
  although we do it at the end of the first iteration so that if a key has
  already been pressed then the message is suppressed.
  
  Reviewed by:	imp
  Approved by:	imp
  Differential Revision:	https://reviews.freebsd.org/D26935

Modified:
  head/stand/common/boot.c

Modified: head/stand/common/boot.c
==============================================================================
--- head/stand/common/boot.c	Sun Dec 13 23:51:51 2020	(r368622)
+++ head/stand/common/boot.c	Mon Dec 14 00:46:24 2020	(r368623)
@@ -202,8 +202,9 @@ autoboot(int timeout, char *prompt)
 	}
 
 	if (timeout >= 0) {
-		otime = time(NULL);
-		when = otime + timeout;	/* when to boot */
+		otime = -1;
+		ntime = time(NULL);
+		when = ntime + timeout;	/* when to boot */
 
 		yes = 0;