From nobody Sat Dec 28 18:56:49 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 4YLBRk4HGDz5j397; Sat, 28 Dec 2024 18:56:50 +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 4YLBRk2lYZz531l; Sat, 28 Dec 2024 18:56:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412210; 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=5epNR9JuZ4/0Y2OOHOZj2usLyzq2Yn/QfaesGqJQiXw=; b=U5uOn8Opysbp8wzs6rr5raJ6nlmQSiLTsgmj+pzM2rPmnGDMWBWYRMuizEVqmy/FzmPE7c VzU1vMN07Crm6vVZ8015jZaHkZEZfF5OGaue8i8mnPjjjRfuRE0jt7ZPdTtyVE4tfhqx3p VwoKSImtyiORWjxv2Wy4LnkAkVMQ32uYnbw5pPtwnGl3shteTkUL4ucGqtVD+Y+SihMlfO YOVKXf3La28fRKiPQHTwJ2/kamEKkAc79dv1MwFojOlG7HuSrOYUe2sgPJJsr14LnGNm6K ZYuTacFbCeK4ST6xJtXa+1kVpMqWcEwHVFlgbtBbGTn+RDiHpjRuMffoC97ucA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412210; 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=5epNR9JuZ4/0Y2OOHOZj2usLyzq2Yn/QfaesGqJQiXw=; b=myDebzTPIOICnovQOYWq1Irvb/GT7zmjhRaazGBRB553h0SUi+GWcmd9O7W4EMAsWMoJce G7U+ZHMiX5N9PC3me9kNuk3YOYC8rO5X8XMkqzkDmq4nCXhPajArhy1QZDcqKtqsdZKKeP nV69DoRH7Jek5x5bhgQFO0zdo9hGGACHwm0h2sXGHCtv5BCN904m8bxKC9qUIMrCtXLrph n1Najr7Zq5EZpyNT7WUt90eEp6ZMmVJpEIkFkbmgkKJRIQ5SajEwsfSEXofx1U65Qd1X+B l3PMBcvNNf6SaIMugtYs6ILAajWdlXlvxYExFa2DkNHf0kQwIGCZMzKmx/vNrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735412210; a=rsa-sha256; cv=none; b=K7R8whrPT8FlEfPDHiGN2cSYnxEsTqsntHSMnR519bRZ8DkYuBa156nIg11e/8inxeW5ed Wg4F0qy9exsdJcWpR/yA3PLrZeYowjpwi5MqXXvzUBPoVp/tF7rnZZCxC4azqRjhvj77ar fp0Fj8bo7q0+52g7fFEeTCoObImlITbyHqL+Syy3DyD/MzMHbSbKWseqDws4XmU8yzNUuj W0SYYmB6M0Nnc7Y8j6rnpEoLmApJrFFEuAGd2lQ/pjXXYdyYAMPphiEXA7ske5eJB16pSx 1j1ydjcdz+jLC+o9kE5bhdC0h5o56ZRkebOFJ3QONkFFH7H9G1O/OwxqK50FZw== 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 4YLBRk0ZBqzbjC; Sat, 28 Dec 2024 18:56:50 +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 4BSIunQa038800; Sat, 28 Dec 2024 18:56:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSIunWg038797; Sat, 28 Dec 2024 18:56:49 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:56:49 GMT Message-Id: <202412281856.4BSIunWg038797@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 7f2d1cac4ea8 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 7f2d1cac4ea8aa85327b86746ee670b53964c6f1 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7f2d1cac4ea8aa85327b86746ee670b53964c6f1 commit 7f2d1cac4ea8aa85327b86746ee670b53964c6f1 Author: Warner Losh AuthorDate: 2024-08-22 23:28:51 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:12:26 +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 (cherry picked from commit 101afbc6ee2f06f77e6886f1f3ffe115c579967c) --- 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 612bd2f5317f..e55702ffee6c 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