From nobody Thu Apr 20 04:15:29 2023 X-Original-To: dev-commits-src-all@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 4Q24826PtGz46DNk; Thu, 20 Apr 2023 04:15:30 +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 4Q24820F34z40Sd; Thu, 20 Apr 2023 04:15:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681964130; 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=sSxdTs4orTFdzfHPJUdNfNvx1SOWK3yd4+B7O4j86zA=; b=Rd8t+4YnGNVR6K1JcXWD86rJ+SV+iDSwTn8GfWCVjP1Kkx4DHSkNBkmkU8t1JEkwh3JKqX RT9e9iWfeB2ip9ikiCDgOvHDd4Yw/cTwgKqAeafqSLEMsrzKE8v1Xmv0sAy4r9/jaur996 5eMlEXvbXKINubWJe1CWHAOEt8v+T0pdLIVOuFi1qiedBInIKDklL43KYP0pEMmgFJUgRf eZOEZxyZIPMpD115TrMss6BFlYzE826C1FWeCggV0dxHw4b1fY5PJZUAbOWrFlmViumfLv OW2OZmi/AfqwUX+pjwW/p1se6X4oRgyY6e6VVz5RpTAO+X9rLPBicbpdCwSZ4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681964130; 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=sSxdTs4orTFdzfHPJUdNfNvx1SOWK3yd4+B7O4j86zA=; b=HpAO8R8xkI1JQy7tSF9RTFOn9soDsX2g4A+3jr2BKRjsc78vfvOOaU6Ebjz0eQQVNA8ds9 cNxnKOc9jTtPrtlfgy7VJpTNq/84L93/VO+7kY1dCy+FYer2x8HRRMOuIoZx+wGNKELkBk ztUbsWdvLrEn4z2fNc729fXGUbnOuYyYBrWtu5vPqTGJqtaHKxyWI/7rRkuyeN8Ka67wc1 TgYBSlny075BEL/3aFDGk56PNl7XRDjjSUCSEOolLpcSeQgpuFuWJPADkOC+KnwV4RneZj RPNJ3MuM1/CzOX8RwuBDRbNZ3eP3Nr9scdw7LgaxtrLaCgyKuiWLt8v8yrG9Dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681964130; a=rsa-sha256; cv=none; b=McHaDL90qOlvm4qIfvNXijQgeD+2OOBIaiIxaOTXCE5ztxc9hMsThZAk23wIuTEUiCX5ch nD1IhkaJIKlD4bAc9iIgQayKWspQBoUEXsea6/ybJGfi3EsgibQeQUAwVlwlxf/SjHzioC ZNLYKI9jnWvAuq8Gbj5rLY+uEdyxvHo/vwNf/LnLbKb/zBUKFvI46R8kl78zU+qCfNOTAo OPwrRG2A5Y1snlz6BgXYEyzYUzqbHxFqdk4XftApF2TVU2cnk7zP2qLTR4mnzMqrh8wbTH rXxyY+4aDxRBHIxz9zjyXI4bLlqMlwxesfW1KNSI5IGlJh7gPVH/GxvhVhpJUg== 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 4Q24816SL8zMwV; Thu, 20 Apr 2023 04:15:29 +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 33K4FTdc060771; Thu, 20 Apr 2023 04:15:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33K4FTYM060770; Thu, 20 Apr 2023 04:15:29 GMT (envelope-from git) Date: Thu, 20 Apr 2023 04:15:29 GMT Message-Id: <202304200415.33K4FTYM060770@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: f0cb73450966 - stable/13 - loader: lua: disable autoboot timer after password entry List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: f0cb73450966fd064015efc8fc0342a44f9eb1d7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=f0cb73450966fd064015efc8fc0342a44f9eb1d7 commit f0cb73450966fd064015efc8fc0342a44f9eb1d7 Author: Cyrus Rahman AuthorDate: 2023-04-16 02:30:41 +0000 Commit: Kyle Evans CommitDate: 2023-04-20 04:15:15 +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 (cherry picked from commit 0ab68e9272b573becdb42edf2b4419cb7ab04707) --- 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