From nobody Sun Apr 16 02:40:32 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PzZDK5sCdz45bQx; Sun, 16 Apr 2023 02:40:33 +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 4PzZDK3Ypjz3R2G; Sun, 16 Apr 2023 02:40:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681612833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HTJh6RpSGor4Kk2kK8QVxzqgy22/LMG5jeo1yN6uE0o=; b=MAf6amiKnt8K8068hDw3Pq43Pa2Jh0HcseSNPLWXroymFOeQKhkjJ2W7ANPfQijd4PMi9H GfYsqXWviRBAkk8BuGlKufeXw9eqTUcI5YrvaT3FG3HJiB/Hh3xX5OfM/i+TkNkFGwerN/ 1I/41AGwGMvOp+2Koow85DjtytYcQBhCuvEHE8RqnkSTCbKJ09HiS0IuNRDEkm6rle6SaN Z2WCIfYivLqFfkXj/PU8Pjm9P7fTapu1cbaDbuQ0N7Exz3yNuLXH5QrQkzEBxJgODBSKtv eMVNZT1iryLeaufinAL/9aebGXxyg21WHiU7J1dMKwFWUXyhNQuy8yMH8p7xOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681612833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HTJh6RpSGor4Kk2kK8QVxzqgy22/LMG5jeo1yN6uE0o=; b=hr0Oq6pdiKTxSa9tQzWPvkF9cqx/HD8hkJJEQMcRoozNe1lMnrarvN++ttj+9+8uKRc1L0 VKlZAF9h5XKgET2sDwl7fyR/og5n2bWPTPjqvVEMXDPmWhbK1Wiaw4kS9ltHnnUwFnBQfQ Y4TfDcsHRkxysH0uyIzoyMWwIMXsIHGatOMzMleDVxpQMrJy77NAvDKb0G9t/ZMSe+J/8L uS7vO4bkUq4AF8JwXPFMl1aE2AWGVuY/aOuzChBBWyoyvnWzB+D5RvFr7OUVLiVQNM+VMz D5lNvfYvjqxQMk5w8LSrmVYm9lIE+1UUqpmoAtGRiri/lrHsfQGdcW6i/W4epA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681612833; a=rsa-sha256; cv=none; b=YcI5AM6TvUQZmkxRPbs+qOEcEzKcbi9hlYTM1t5QgdjBF7h7uvC1XW2UWELLTqywFGn5xf OI8PjLkHSLLQA1Q3GIab4SIo0q+chAaXUGY/OsA11GVV7oxRpIZhQlpKaQRyWKR1EET70e Ked2moSs3gCf3TnODfemnw+3ybS34NJtLvgHzc2z6k7/y381k88ZMOAjkTBVlh+eesBS3X dNsFknt2eET6uwrq3p4k6Mjrdn1vsd+Ze5R7mcPHFK9WolaoOJor2SU/8X+hoGUvWnNoHg dPmuYTIde/DAuh9/AiwYwZDvCgFNYzgTr12JifkQN0Ek/MlhIkq/8bS9i+cjRQ== 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 4PzZDK0YzdzVxh; Sun, 16 Apr 2023 02:40:33 +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 33G2eWSM005753; Sun, 16 Apr 2023 02:40:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33G2eWJU005752; Sun, 16 Apr 2023 02:40:32 GMT (envelope-from git) Date: Sun, 16 Apr 2023 02:40:32 GMT Message-Id: <202304160240.33G2eWJU005752@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 0ab68e9272b5 - main - loader: lua: disable autoboot timer after password entry List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org 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/main X-Git-Reftype: branch X-Git-Commit: 0ab68e9272b573becdb42edf2b4419cb7ab04707 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=0ab68e9272b573becdb42edf2b4419cb7ab04707 commit 0ab68e9272b573becdb42edf2b4419cb7ab04707 Author: Cyrus Rahman AuthorDate: 2023-04-16 02:30:41 +0000 Commit: Kyle Evans CommitDate: 2023-04-16 02:39:56 +0000 loader: lua: disable autoboot timer after password entry In the lua loader, if one sets a password in loader.conf, the autoboot_delay timer will start before the menu is displayed. One can interrupt the autoboot and bring up the menu by entering a keyboard character before the timer expires. If this is done a prompt for the password is displayed. Entering the password will bring up the menu, but the timer will again start and another keyboard character must be entered or autoboot will abort the menu and boot the system. PR: 265472 Reviewed by: kevans MFC after: 3 days --- stand/lua/password.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/stand/lua/password.lua b/stand/lua/password.lua index 8edd4edd7ec3..3aea8e80bae6 100644 --- a/stand/lua/password.lua +++ b/stand/lua/password.lua @@ -135,6 +135,7 @@ function password.check() local pwd = loader.getenv("password") if pwd ~= nil then core.autoboot() + loader.setenv("autoboot_delay", "NO") -- The autoboot sequence was interrupted, so we'll need to -- prompt for a password. Put the screen back into a known -- good state, otherwise we're drawing back a couple lines