From nobody Sat Dec 28 18:54:56 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 4YLBPY1yJBz5j33s; Sat, 28 Dec 2024 18:54:57 +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 4YLBPY1C4Qz508r; Sat, 28 Dec 2024 18:54:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412097; 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=YHxnRE6HbnLk/zJcBxCfqgl5jZkvlTodE/wrLn0WOh4=; b=acxOlbf2VhRP7C/b5VsHw6Mhdn/znBxvJ/p6kO1WH8ylgOWN6faR7FE1DCJ5zYPekuJX97 /UJ1tp8tAiHV2khc80M+INocNlyFddtV+xyHaRjkdVO/jOCSsluHTm5ImQN7kt8GFTo9EV ibF3SCgLUGe5jlevJmkAAazzUkX/ysLvkcVZbNuLrt+a666jUfhUmZXEliRCg6ExMWwvsB Agj3WA4PUPfZg2Em88prizjP0xw5W8H0wbGO28zEbkV/Cy9i7PvSf370nIsZSHkEaHD9Rf BjfDSaAW7j3/giU6eJYmHeWX1d6z7GnfElxSzdMT80GaHqVP4sv2TawgMUVv/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412097; 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=YHxnRE6HbnLk/zJcBxCfqgl5jZkvlTodE/wrLn0WOh4=; b=aQGhplWCKnbo/TwltPUvnBXF2e8x0vEAQzKlu7ftjPKcsKhRwtebziFZCy+5D5HLzIqNMC Xhje2V2mafHH/aFV4Vz5YmAyimfdw3OWdx2/dbn+tiscv5YMs/IDs2hRgbb1y6Yu9G5SA9 xGim+O9mJlBzSSELw8kGJP95xi88KR/WUc0nI1iBNLYCDJ8kOTVq5pO9C+/sVR5SOjdkGP e6ytmO1vVzu5koJj+ICPBCdvdvn65T6EhQfgWR1+YZAB6R5wNzLbRwDsjNW5mkTJw3ZehC vnU7qmHFKaeLp7fqnqQ2ep8Bi3CCqX+x/oEQOxuinTZvYAj1GNSgRTTxp+QAyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735412097; a=rsa-sha256; cv=none; b=Z/wWsYHkgdkPVUxiv6eEBXa5uiRoMDIkyCWqdHLN7yABD8KzsLw1CIDtLxwN8CPTyegP11 WmBMqGI0sj0k5APj8bTNFq4X8dxkS9Ynplw/kPDiJDLI7CTsngIQnYcvNtTd2bATEEpbIb Q79wu/4H75ZHtuPwjYG3woqIgof4kAMzY/Jr+QkO5LzTzxjmXvC5kQdvxiDJlZJIcRjWOT 2zy0r5HtczJU/87QPhMeak3lx2UyRyjQHjrYmGTKKOug7uuKuLV30Lo6Up5slLQeDhA21N lHrakFViORZS35ccNjsY9ADaWolRpNoyaw1+T7EV6IRWxgoLk/dYtm0AewLbjQ== 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 4YLBPY0hTzzchf; Sat, 28 Dec 2024 18:54:57 +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 4BSIsuHp037458; Sat, 28 Dec 2024 18:54:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSIsu8k037455; Sat, 28 Dec 2024 18:54:56 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:54:56 GMT Message-Id: <202412281854.4BSIsu8k037455@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: 59b6187c570d - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 59b6187c570d655c619dc32181934287e956bc43 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=59b6187c570d655c619dc32181934287e956bc43 commit 59b6187c570d655c619dc32181934287e956bc43 Author: Warner Losh AuthorDate: 2024-08-22 23:28:51 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:12:21 +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 2dcf7d5de0f8..5a6a2174d13c 100644 --- a/stand/lua/drawer.lua +++ b/stand/lua/drawer.lua @@ -459,7 +459,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 d74c7cd68791..894c0af69d35 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