From owner-svn-src-head@freebsd.org Wed Feb 21 14:37:50 2018 Return-Path: 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 54E25F07573; Wed, 21 Feb 2018 14:37:50 +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 090E17E86B; Wed, 21 Feb 2018 14:37:50 +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 F334E19C8F; Wed, 21 Feb 2018 14:37:49 +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 w1LEbnun002985; Wed, 21 Feb 2018 14:37:49 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1LEbnWv002984; Wed, 21 Feb 2018 14:37:49 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201802211437.w1LEbnWv002984@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Wed, 21 Feb 2018 14:37:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r329716 - head/stand/lua X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/stand/lua X-SVN-Commit-Revision: 329716 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Feb 2018 14:37:50 -0000 Author: kevans Date: Wed Feb 21 14:37:49 2018 New Revision: 329716 URL: https://svnweb.freebsd.org/changeset/base/329716 Log: lualoader: Use the key that interrupts autoboot as a menu choice This matches forth behavior. Hitting "6" when autobooting at the welcome menu will now take you directly to the "Boot Options" menu. We likely have some slight optimizations we should make, like not checking autoboot every time we open a new menu and things of this nature. Further work will go towards this end. Modified: head/stand/lua/menu.lua Modified: head/stand/lua/menu.lua ============================================================================== --- head/stand/lua/menu.lua Wed Feb 21 14:33:00 2018 (r329715) +++ head/stand/lua/menu.lua Wed Feb 21 14:37:49 2018 (r329716) @@ -291,11 +291,13 @@ function menu.run(m) screen.defcursor() local alias_table = drawer.drawscreen(m) - menu.autoboot() + -- Might return nil, that's ok + local autoboot_key = menu.autoboot() cont = true while cont do - local key = io.getchar() + local key = autoboot_key or io.getchar() + autoboot_key = nil -- Special key behaviors if (key == core.KEY_BACKSPACE or key == core.KEY_DELETE) and @@ -360,13 +362,13 @@ end function menu.autoboot() if menu.already_autoboot then - return + return nil end menu.already_autoboot = true local ab = loader.getenv("autoboot_delay") if ab ~= nil and ab:lower() == "no" then - return + return nil elseif tonumber(ab) == -1 then core.boot() end @@ -395,7 +397,7 @@ function menu.autoboot() print(" " .. " ") screen.defcursor() - return + return ch end end