From nobody Fri Aug 23 02:03:06 2024 X-Original-To: dev-commits-src-main@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 4Wqjyw4zW6z5V3Y7 for ; Fri, 23 Aug 2024 02:03:20 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) (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 4Wqjyw2wWZz518R for ; Fri, 23 Aug 2024 02:03:20 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pj1-x102e.google.com with SMTP id 98e67ed59e1d1-2d3c08541cdso1167902a91.2 for ; Thu, 22 Aug 2024 19:03:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1724378598; x=1724983398; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=rSV3skU007kpQkDpUnBoPAVTvUH36PLn52IBNlj38So=; b=Rel9++hUCWF0Bzcb2EBczjFXm6rGRJCPDIDVx6qxBWPtSYs+4Bb0J39a04qQPWL2Hs wkPSn47G+OmywFlmy/ltrWda3ne2uUx7fSz4bTJtKIPHJZ2oRSIes2rQ6eNl2sjrRmCS CeJ/0V+l973+p4sNG7rKDp4mSp1iUuosv3R7lMZLioEyGO1KsNOeuwR0BINx3IgxIfNl M1XCoIcBeGIQ65ceXGbALq5uP5oDQrDwAYBocawzNH2hHnGbTitZGsauMjd3rUhgI/I0 bYucofD+1BqFDrWlnrYcuBQ4YT9e0TyLLUXUT/7d15y4LDZ/49bhZ5YTzAgmaQlnfZfk Arfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724378598; x=1724983398; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=rSV3skU007kpQkDpUnBoPAVTvUH36PLn52IBNlj38So=; b=wzVzRbFkz2QN3ouDKCJLKd+KHc8Gt77H5NxHh3rQQPpch1GZKqlS1JQJtx4yCqtT2d V6zzsEcpM4Ugw54Lnp3PtBz2Xsl7EXQnTHw7y+/dG5jP5N97n6Y3uNXBd3pX2xzMflxI XRSXbAq/TCgcj6kgJsr4I4QJeixmrvArree7BBHgko5L0IKzAg6hvtjoKaoV4BgNMyXM JaPmdpFbQwgfm3ranf2BjI0SOCVctbO2TSotkLZt/jC+AQXxOMTNl+/xHvGAyNS13+vZ GQaKzalgL1VwvMWEqZLyXGFwzZ1cQ4+Yrj+LKs2RfpipjzumXn3XjSl5WliTBSK1hrnZ Pyug== X-Forwarded-Encrypted: i=1; AJvYcCUPegiGMVwONaOcsFQs3E0y57wWYvta+lS9RwWcLuPh8ijoZ6JOZ7v8NuqDfgbCuZSOlzFbGueo3sa5T8U/M8XBAH2qHA==@freebsd.org X-Gm-Message-State: AOJu0YxubVDCcBet2hQhakFzXXAUCYtH79RymQ4F1D81AcqWYhoKVMhw RnEofgH0DdyRUgyno+3zOp2DNGXUjjElTCXgkd6YFXOy+Wbo5id13svbjZx/Mrpa4MEBF8jfB97 +iIOOIDmdk1ashVHXi3oNmBec0BKb/rW28nUK8Q== X-Google-Smtp-Source: AGHT+IG/xj5YViB1QuP0yX7Xy6ah9ZMxl4squGIhxDlIq9TeHd9VQrU9+JayB05V5HREv2Ob8pq7cJsVOQOLNisUGZ8= X-Received: by 2002:a17:90a:77c5:b0:2d0:d82:60ae with SMTP id 98e67ed59e1d1-2d646d6f656mr620728a91.37.1724378597974; Thu, 22 Aug 2024 19:03:17 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202408222337.47MNbMeJ041064@gitrepo.freebsd.org> <895EA850-1C39-40F6-9710-524C4B7342CA@freebsd.org> In-Reply-To: <895EA850-1C39-40F6-9710-524C4B7342CA@freebsd.org> From: Warner Losh Date: Thu, 22 Aug 2024 20:03:06 -0600 Message-ID: Subject: Re: git: 101afbc6ee2f - main - loader/menu: tweak for added line To: Jessica Clarke Cc: Warner Losh , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Type: multipart/alternative; boundary="000000000000ca83c00620502dc3" 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:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4Wqjyw2wWZz518R --000000000000ca83c00620502dc3 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Aug 22, 2024 at 5:52=E2=80=AFPM Jessica Clarke = wrote: > On 23 Aug 2024, at 00:37, Warner Losh wrote: > > > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D101afbc6ee2f06f77e6886f1f3ffe11= 5c579967c > > > > 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 =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 > > > > 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 =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? > I've not tested that configuration, so I don't know. It's my guess it will be fine. I wonder if this configuration is relevant, though. 80x25 is the smallest text console in common use in FreeBSD these days. 80x24 used to be very relevant for Serial, first as the typical terminal in the 70s and 80s, then in the default for xterm in the 90s and 2000s. But in 2024, I'm not sure there's many people still confining themselves to that, but maybe I'm ignorant of why my breaking it might be relevant. I'll test it this weekend... Warner --000000000000ca83c00620502dc3 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Thu, Aug 22, 2024 at 5:52=E2=80=AF= PM Jessica Clarke <jrtc27@freebsd.= org> wrote:
On 23 Aug 2024, at 00:37, Warner Losh <imp@FreeBSD.org> wrote:
>
> The branch main has been updated by imp:
>
> URL: https://= cgit.FreeBSD.org/src/commit/?id=3D101afbc6ee2f06f77e6886f1f3ffe115c579967c<= /a>
>
> commit 101afbc6ee2f06f77e6886f1f3ffe115c579967c
> Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> AuthorDate: 2024-08-22 23:28:51 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2024-08-22 23:28:51 +0000
>
>=C2=A0 =C2=A0 loader/menu: tweak for added line
>
>=C2=A0 =C2=A0 I added a line to the menu, but didn't adjust so thin= gs were a
>=C2=A0 =C2=A0 line off. Make the necessary adjustments.
>
>=C2=A0 =C2=A0 Fixes: 7cb65be96d47
>=C2=A0 =C2=A0 Sponsored by: Netflix
>=C2=A0 =C2=A0 MFC After: 3 days
> ---
> stand/lua/drawer.lua | 2 +-
> stand/lua/menu.lua=C2=A0 =C2=A0| 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 =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
>
> 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 =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?


for Serial, first as the typical terminal in the 70s and 80s, then in the = default

--000000000000ca83c00620502dc3--