From owner-dev-commits-src-branches@freebsd.org Sun Sep 12 05:42:24 2021 Return-Path: Delivered-To: dev-commits-src-branches@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 2DFC467E2F9; Sun, 12 Sep 2021 05:42:24 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H6dmH3c1Rz3k02; Sun, 12 Sep 2021 05:42:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 372D86447; Sun, 12 Sep 2021 05:42:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 18C5gNig009614; Sun, 12 Sep 2021 05:42:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18C5gNEu009613; Sun, 12 Sep 2021 05:42:23 GMT (envelope-from git) Date: Sun, 12 Sep 2021 05:42:23 GMT Message-Id: <202109120542.18C5gNEu009613@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 81719aafa86d - stable/12 - lualoader: use more concise verbiage for autoboot MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 81719aafa86d9aa9ee5efc49689a16547ab7f2af Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Sep 2021 05:42:24 -0000 The branch stable/12 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=81719aafa86d9aa9ee5efc49689a16547ab7f2af commit 81719aafa86d9aa9ee5efc49689a16547ab7f2af Author: Kyle Evans AuthorDate: 2021-09-08 21:34:33 +0000 Commit: Kyle Evans CommitDate: 2021-09-12 05:39:36 +0000 lualoader: use more concise verbiage for autoboot The behavior remains the same, but lualoader now uses the more concise verbiage that forthloader used. This is particularly important because the previous line would exceed the right boundary of the menu and run straight into space that would typically be allowed for the logo. This makes it slightly easier to port logos from forthloader to lualoader. (cherry picked from commit ed107537b43cabf7a18e73a17856a9d9e170c6e9) --- stand/lua/menu.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/stand/lua/menu.lua b/stand/lua/menu.lua index fda16fda71ff..d3f84673cef4 100644 --- a/stand/lua/menu.lua +++ b/stand/lua/menu.lua @@ -485,8 +485,7 @@ function menu.autoboot(delay) last = time screen.setcursor(x, y) print("Autoboot in " .. time .. - " seconds, hit [Enter] to boot" .. - " or any other key to stop ") + " seconds. [Space] to pause") screen.defcursor() end if io.ischar() then