From nobody Thu Apr 17 08:19:40 2025 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 4ZdW5n1T32z5sp2L; Thu, 17 Apr 2025 08:19:41 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZdW5m57SSz3W3s; Thu, 17 Apr 2025 08:19:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744877980; 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=/K3ZNI8qO8DJOZpF2an0IclTuOdxdmIeFXhQpcaX0e0=; b=fkz+slam6f0rU1G0kOnMDGFXMzjzwXvkYNl7PUbC171OOmkT6cSB9S8J5c0/a46px7ehHP Mo7Mu4WNBQOayFb6gj9imS7KRUr+W9QkHYxLnvhCnyfrKTtoUuLbmIq+2a4129dNEozqP2 vUy7CETkMwtJgBAlYv0gkBP/DPRukPoJKfXNDPCrzb+kOdmoLNYo9064F2id2xYFoEt6Zc frNlkH4sPF/HqKGtJBjJnrBHM7GDy/oI1ykyrXp4AWVP7KceH9RnuS0NNfFlUfQQb/MZMh 1whs3vIcM/c51PNe5bZY3L+FzDnZiHQoz5qKYE/8CXEUtC7V+gWssRUuwExMHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744877980; a=rsa-sha256; cv=none; b=ei+O9gFly9HtUkPD/nkAD8wPEuTUwhSFGdq3Dk4ptIc/tX+tJTCfl/F+bpEk9JzypVrmfH zm+0NYWp+bdMQSrgLEi56zJXF2GFZJBTP3bbDr4z22Ajyae9wmX+j73vXOdtiM3652QWmD y/LzxIbeTBhKaibRmKMdiPZyYg23EEyCdjKDnsSH+JQs1YNFUUO6o6utKd5oZWPTiuupnd dvVdN+eO8nqQ/aa5/JtKblviFnIPzKcrolcTnES/aHxjX4Et61nC8EiCxtV2i5wXpekvPC 5/P2mpn8zMr2KeeyYFuP60pHHJO8ytEP9LjQv1XScZgCJg+qleoKT5JTXit6Zw== 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=1744877980; 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=/K3ZNI8qO8DJOZpF2an0IclTuOdxdmIeFXhQpcaX0e0=; b=DWr6JWpMLINV+T0XsxNus3iEdn2n77UAH0h9luFRS3apYP7SeZsCdNXxhlWGD65X6eTbjd /Z21/S/YcHJ1hzrz5EEj6zE5eSCXl9edh3Yb7tRYs2Tlw2mKLQvM5799+H+mIgnO8JP1n/ HnknBjuHAwYVXVw2iZC5D88x6y12LQ4qznOvTdfK6NrR0VypTU+dAu/uQLXCGkoP4CQ0bK LX6br0wCFctCtLSqVl/649WxE+yB5k7fs5Eq8JyfD6+JTbELS76ZPNCIiFn3kzfNDHxqwF 6aH9PhNHFDOy98sTkHraIrhTs4p5gTtlTuP0pjSPCi2gZx4nVUQlhZk4OhoANw== 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 4ZdW5m4hm9zgvP; Thu, 17 Apr 2025 08:19:40 +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 53H8Jete067758; Thu, 17 Apr 2025 08:19:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53H8Jexm067755; Thu, 17 Apr 2025 08:19:40 GMT (envelope-from git) Date: Thu, 17 Apr 2025 08:19:40 GMT Message-Id: <202504170819.53H8Jexm067755@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: a962800a09a4 - main - loader: Add loader_menu 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a962800a09a45b8f702ebd1a06b8f20bc84e97b1 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=a962800a09a45b8f702ebd1a06b8f20bc84e97b1 commit a962800a09a45b8f702ebd1a06b8f20bc84e97b1 Author: Emmanuel Vadot AuthorDate: 2025-04-14 06:38:28 +0000 Commit: Emmanuel Vadot CommitDate: 2025-04-17 08:18:48 +0000 loader: Add loader_menu If set to 'none' then the menu isn't displayed. The 'brand' and 'logo' part are stil displayed. Differential Revision: https://reviews.freebsd.org/D49820 Reviewed by: imp, kevans Sponsored by: Beckhoff Automation GmbH & Co. KG --- stand/defaults/loader.conf.5 | 4 ++++ stand/lua/drawer.lua | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/stand/defaults/loader.conf.5 b/stand/defaults/loader.conf.5 index a364030b8814..807d8ae62e9a 100644 --- a/stand/defaults/loader.conf.5 +++ b/stand/defaults/loader.conf.5 @@ -424,6 +424,10 @@ Possible values are: .Dq Li beastie , and .Dq Li none . +.It Va loader_menu +If set to +.Dq NONE , +the menu will not be displayed .It Va loader_color If set to .Dq NO , diff --git a/stand/lua/drawer.lua b/stand/lua/drawer.lua index 1bf741b2373e..ee33ae753916 100644 --- a/stand/lua/drawer.lua +++ b/stand/lua/drawer.lua @@ -166,6 +166,10 @@ local function drawmenu(menudef) local x = menu_position.x local y = menu_position.y + if string.lower(loader.getenv("loader_menu") or "") == "none" then + return + end + x = x + shift.x y = y + shift.y @@ -276,6 +280,10 @@ local function drawbox() local menu_header_align = loader.getenv("loader_menu_title_align") local menu_header_x + if string.lower(loader.getenv("loader_menu") or "") == "none" then + return + end + x = x + shift.x y = y + shift.y