From nobody Thu Aug 22 23:37:22 2024 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 4WqfkV5hPqz5TrCt; Thu, 22 Aug 2024 23:37:22 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WqfkV4hRLz4pQn; Thu, 22 Aug 2024 23:37:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724369842; 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=VeHq6ZltpgZ/kSzxGMbiu7jlnERYiLmGYs1Z6ftlk4U=; b=CXg1nmq/zTYEEBXgNL7AWFgW2DLZaMbGuXYRtlW2DYy+lvOQrp0mvHVx8c4LS286MfY2Qn HbS6BjKzTBQKepcSGe4POGMGV5ABoWWE50xfEsRhAC7Z+aVQLNJC7nMkfsp2P6ixxyKZ9D zNRZM+m0wB8sumK6TIJVEd5qVeqQWjH6w+hQgKo5hBL+w8b5+UmFFb8ihzC894cS6T8mXP NRwYZVHcaYNeopaVEFJneJkBEMyOWDPP9wDDX9ToZz0T/bD8xq/rMUhs74aQ9jRf0Rjbr9 nwHJwPzPP+4KjrM3KSQ1cXjMnyyB7SpOss+aBG0NVf+oG5fBg0vs4K8M19pfXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724369842; a=rsa-sha256; cv=none; b=aeioZB5PfDTeOZ7SpLoostK2KxGsIo4SK0NiEqGffdIIx5iB4FZ/KILUMvWbEsLLj0866p YO9sB/hJ0Cr5LJ3hjIkFaDvUpEgsFUSQ8tmcU861wVU0AdoBoQlTpAz1KCxQQ/Tde5E5IK BIuR8nbedH4OxcsJzX2I7CmTrwYNNmIJrJF081csWvm5wN82isJvVzP83uIHlmlHPBHCp4 SNqnDrNoCNGGialsnzBzHVBTZaIumG+OJv2KC/JGFD/Pxewc36UowwI5SO9XfkyB4ve+en Q8c2LcXzCocd4ivmOptOZFV5WQ11+pmTxkJQiJmzCsO0fhM5PINCbvU6DKIrLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724369842; 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=VeHq6ZltpgZ/kSzxGMbiu7jlnERYiLmGYs1Z6ftlk4U=; b=dwCO6Gi2bMQuakLAIdYax8nMwPxdyWuAN+31VdYSh4bIIL8rmaFYbz2bK7WjAt7ltaNvj2 r9i3i4l/EXYykTQh1uzozgHbqSm+eN4XKD8y7mQJ91VzoaLWcsYp16yvbevbd5Yf2RGB64 QcyBQZlVnE7pnH61eM+7+2Mk4KPHcqr6z+AdARsXu24ckA6KW5ATRoH42vfpNEnH2CchI+ SA4mFt57c+e0aHvkxv7fFecE7tbR5itmdMVN5xUJevwgFF8DWp4TCye7/SiuFRqTQrH19A 5eUfHXCFKaJAuu128pS65TWJLI9gmAvgByGbVfBSUmVBCa+OzVqrj/v4Ee75fw== 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 4WqfkV4B8Jzngr; Thu, 22 Aug 2024 23:37:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47MNbMSG041067; Thu, 22 Aug 2024 23:37:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47MNbMeJ041064; Thu, 22 Aug 2024 23:37:22 GMT (envelope-from git) Date: Thu, 22 Aug 2024 23:37:22 GMT Message-Id: <202408222337.47MNbMeJ041064@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 101afbc6ee2f - main - loader/menu: tweak for added line 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 101afbc6ee2f06f77e6886f1f3ffe115c579967c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=101afbc6ee2f06f77e6886f1f3ffe115c579967c commit 101afbc6ee2f06f77e6886f1f3ffe115c579967c Author: Warner Losh AuthorDate: 2024-08-22 23:28:51 +0000 Commit: Warner Losh CommitDate: 2024-08-22 23:28:51 +0000 loader/menu: tweak for added line I added a line to the menu, but didn't adjust so things were a line off. Make the necessary adjustments. Fixes: 7cb65be96d47 Sponsored by: Netflix MFC After: 3 days --- stand/lua/drawer.lua | 2 +- stand/lua/menu.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/lua/drawer.lua b/stand/lua/drawer.lua index a009b78164df..3a462930b86b 100644 --- a/stand/lua/drawer.lua +++ b/stand/lua/drawer.lua @@ -472,7 +472,7 @@ logodefs = { brand_position = {x = 2, y = 1} logo_position = {x = 46, y = 4} menu_position = {x = 5, y = 10} -frame_size = {w = 42, h = 13} +frame_size = {w = 42, h = 14} default_shift = {x = 0, y = 0} shift = default_shift diff --git a/stand/lua/menu.lua b/stand/lua/menu.lua index 0587e5ae6586..ed84360d93b0 100644 --- a/stand/lua/menu.lua +++ b/stand/lua/menu.lua @@ -535,7 +535,7 @@ end function menu.autoboot(delay) local x = loader.getenv("loader_menu_timeout_x") or 4 - local y = loader.getenv("loader_menu_timeout_y") or 23 + local y = loader.getenv("loader_menu_timeout_y") or 24 local endtime = loader.time() + delay local time local last