From owner-svn-src-head@freebsd.org  Sat Mar  3 17:18:41 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 58767F2AECD;
 Sat,  3 Mar 2018 17:18:41 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 00F876C0B6;
 Sat,  3 Mar 2018 17:18:41 +0000 (UTC)
 (envelope-from kevans@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 EFEE612E8;
 Sat,  3 Mar 2018 17:18:40 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w23HIeCA036976;
 Sat, 3 Mar 2018 17:18:40 GMT (envelope-from kevans@FreeBSD.org)
Received: (from kevans@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w23HIecS036975;
 Sat, 3 Mar 2018 17:18:40 GMT (envelope-from kevans@FreeBSD.org)
Message-Id: <201803031718.w23HIecS036975@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kevans set sender to
 kevans@FreeBSD.org using -f
From: Kyle Evans <kevans@FreeBSD.org>
Date: Sat, 3 Mar 2018 17:18:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r330340 - head/stand/lua
X-SVN-Group: head
X-SVN-Commit-Author: kevans
X-SVN-Commit-Paths: head/stand/lua
X-SVN-Commit-Revision: 330340
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.25
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: Sat, 03 Mar 2018 17:18:41 -0000

Author: kevans
Date: Sat Mar  3 17:18:40 2018
New Revision: 330340
URL: https://svnweb.freebsd.org/changeset/base/330340

Log:
  lualoader: Execute menu_timeout_command at the end of menu autoboot
  
  Instead of hardcoding "boot", respect menu_timeout_command from Forth. It
  still defaults to 'boot', so this will not be a functional change for most.

Modified:
  head/stand/lua/menu.lua

Modified: head/stand/lua/menu.lua
==============================================================================
--- head/stand/lua/menu.lua	Sat Mar  3 17:13:12 2018	(r330339)
+++ head/stand/lua/menu.lua	Sat Mar  3 17:18:40 2018	(r330340)
@@ -448,8 +448,9 @@ function menu.autoboot()
 
 		loader.delay(50000)
 	until time <= 0
-	core.boot()
 
+	local cmd = loader.getenv("menu_timeout_command") or "boot"
+	loader.interpret(cmd)
 end
 
 return menu