From nobody Thu Aug 22 23:52:27 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 4Wqg493P9bz5Tsr3 for ; Thu, 22 Aug 2024 23:52:41 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wqg486gxhz4qqS for ; Thu, 22 Aug 2024 23:52:40 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-a7aa086b077so169824866b.0 for ; Thu, 22 Aug 2024 16:52:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724370758; x=1724975558; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oE33Jgf4TE10QmS/9xN+8Iu/tuLYDd9dRTDY76Eh+Vw=; b=lRd6uJZDWJ8dKifB/Y9A/e2a91KEjnYAo1W5Mil5JMTdXPQtwVB1yMwk9/c2rXlaO8 omTm86T1M9phgobFyzm0ns9GWtoMk/fylcwMTZkWYDHRYxKIaWmlcBaEHM9b6lAC7Uwm ov6MldrV9KpbjuY9QNTkgNMugr+Qu5PQx+Lg1l8zZ9wzNcUZKfiVcvLzPOitElvqrmxJ 0iisWnTsiFQh6iB+CPFrrnNBNpYmXG8p9qTLWStR4SmlNkbW/FwqYyXHPnvOrIymYQh8 zmDOYLpwBnlwZDxCNa/Pl9LMzciywrRV7kH7eNT5YnXgsLiuFLqkt0EczINDYA5tHgTI G/kA== X-Forwarded-Encrypted: i=1; AJvYcCUHD9E1CJ29DC2F7i7/leL6BiPUa6er5rEHBfhLEUsrxgjBlxymf1+2I4PmNi8ozfFn03qnxCn6KV8A9lbuOUQlYnpP@freebsd.org X-Gm-Message-State: AOJu0YxYiHtteBFLOu20sj082/vQuocRVAFfiF2xnBtYRyQbiSsl6rsP nfV3YMkjREtM1BQEM1AZ7S0iygSEcbJHuhHwz5NHsj9Dk1V7BaM7lopJP0XXEjZYMfZOOLJVEFz 8 X-Google-Smtp-Source: AGHT+IH8HeqAT+7lyA8SDSp9xb3bvsd7sMqEUXtVHyzRhYi4/QTxCnW7ao2jNye4cRmtA9Zuus5kzw== X-Received: by 2002:a17:907:d90:b0:a7a:a06b:eecd with SMTP id a640c23a62f3a-a86a518b32amr21244066b.5.1724370758389; Thu, 22 Aug 2024 16:52:38 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.201]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a868f48afa6sm177927566b.183.2024.08.22.16.52.37 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Aug 2024 16:52:37 -0700 (PDT) Content-Type: text/plain; charset=us-ascii 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 (Mac OS X Mail 16.0 \(3776.700.51\)) Subject: Re: git: 101afbc6ee2f - main - loader/menu: tweak for added line From: Jessica Clarke In-Reply-To: <202408222337.47MNbMeJ041064@gitrepo.freebsd.org> Date: Fri, 23 Aug 2024 00:52:27 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <895EA850-1C39-40F6-9710-524C4B7342CA@freebsd.org> References: <202408222337.47MNbMeJ041064@gitrepo.freebsd.org> To: Warner Losh X-Mailer: Apple Mail (2.3776.700.51) X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4Wqg486gxhz4qqS On 23 Aug 2024, at 00:37, Warner Losh wrote: >=20 > The branch main has been updated by imp: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D101afbc6ee2f06f77e6886f1f3ffe115= c579967c >=20 > commit 101afbc6ee2f06f77e6886f1f3ffe115c579967c > Author: Warner Losh > AuthorDate: 2024-08-22 23:28:51 +0000 > Commit: Warner Losh > CommitDate: 2024-08-22 23:28:51 +0000 >=20 > loader/menu: tweak for added line >=20 > I added a line to the menu, but didn't adjust so things were a > line off. Make the necessary adjustments. >=20 > 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(-) >=20 > 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 =3D { > brand_position =3D {x =3D 2, y =3D 1} > logo_position =3D {x =3D 46, y =3D 4} > menu_position =3D {x =3D 5, y =3D 10} > -frame_size =3D {w =3D 42, h =3D 13} > +frame_size =3D {w =3D 42, h =3D 14} > default_shift =3D {x =3D 0, y =3D 0} > shift =3D default_shift >=20 > 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 >=20 > function menu.autoboot(delay) > local x =3D loader.getenv("loader_menu_timeout_x") or 4 > - local y =3D loader.getenv("loader_menu_timeout_y") or 23 > + local y =3D loader.getenv("loader_menu_timeout_y") or 24 > local endtime =3D loader.time() + delay > local time > local last Does this mean we no longer fit a standard 80x24 terminal, or does this place it on the 24th row so just fits? Jess