From nobody Tue Jul 30 03:34:34 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 4WY17H0LxHz5SXQN; Tue, 30 Jul 2024 03:34:35 +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 4WY17G6yxWz4cCW; Tue, 30 Jul 2024 03:34:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722310475; 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=pQUB7yFnPcmGMkVyDweXheB2LGBnNepNjOOWVNGSu9w=; b=ms07olS4vd4xLn62y6jbSXyK5ptNhI3c/nRT0lc9JidlT6QBaJ5L+gJJCwVwKiCpPmqj2D JD1caVpwNNMF5BcTC/R73O1LVRgRLlcbQb2cRqMTQ6wtAaPX1w209H+ssz/qkhcl5ZrRkQ rjOGspJlyUrpmSushUL6W3D6KbeCc2G2UVtfMzlkzl06MZvKABMP/5+6MulupoIZHFADHG KYtE8UUEgoT0Vd23ZJBk5qQvgthaLaZNNwy1k7fePIVPosC6rFPLfd0rVnwUvrnSkl77pF Q7RHYG+SNb92MsEsY7hhAd52zAhbSWBbHbwTfR8nP7HyNXIrlzPscKlK8aIHEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722310475; a=rsa-sha256; cv=none; b=iLd2/5lG9nWBSrlh9eRG9d/8Do0ObzCn8JPbNrBzqeIjhzSmiCR62J/TwBaeNzh/ocy9q/ 8PAL9Vdhul/VQfn5D575zGepsu2aA+nQqo0umJSziPyGSEv9DDfKMAGuRMIrbJqYIzsXt3 WahNexIbLwill03SL7X8comR3LVqCfE6dlZWjb/LLFR1d88lrzRy/xpcHo8Qho2vpR4LCv RRrNahdNSVnBYGiXnmJgnEFGQj6y9ZMZVfJBsRODsCHN+MVYd26yommLVZ0OOLYj+0vm9l HFyhNkFS8lcwcKy8cp6/2GP7wHpjWo7EWLyGgZwnuaXR/hTG9qdP0FCeE/1xeA== 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=1722310475; 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=pQUB7yFnPcmGMkVyDweXheB2LGBnNepNjOOWVNGSu9w=; b=iHYSqzWmeaNIkwoUxy5lfLOPH75bwb63BSSVowx7dyaIRW7HandJGTSng3HrCEKIe5f/GV 3OyDvdgOV3vz4blKALHcEcaSBV3395sqUYsLY91E7Ui1pBiaoXORj5PiRAIySANBJrzWrr oe3L+zM0bcgq1BfBITAzxB6hF83K4X/kafjG+0Z2l6oXEX9VMk9Z4SLENrWcS1IQhsgicl 7VgRIDyg7RbAbiaSmifkC453Tg9CcReIPJEOFpXI20xIn5XgpeX2Otc4UJPpe9ZQUMdpeh fAzwQFzxjl9VqDCDVYxdw97VCemb9PqVE8AYMUSZOVtLL+JTaEwfohbyh9vIjw== 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 4WY17G6WRZz1238; Tue, 30 Jul 2024 03:34:34 +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 46U3YYVU026668; Tue, 30 Jul 2024 03:34:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46U3YYlf026665; Tue, 30 Jul 2024 03:34:34 GMT (envelope-from git) Date: Tue, 30 Jul 2024 03:34:34 GMT Message-Id: <202407300334.46U3YYlf026665@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 7cb65be96d47 - main - stand: Use correct loader needs to be updated code 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/main X-Git-Reftype: branch X-Git-Commit: 7cb65be96d47cbe0b740266bc633d272fc4c5e6b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7cb65be96d47cbe0b740266bc633d272fc4c5e6b commit 7cb65be96d47cbe0b740266bc633d272fc4c5e6b Author: Warner Losh AuthorDate: 2024-07-30 02:15:19 +0000 Commit: Warner Losh CommitDate: 2024-07-30 02:26:11 +0000 stand: Use correct loader needs to be updated code Use the correct loader code that adds an inactive highlighted menu item indicating that an update is needed. My laptop is the only machine that I have a boot menu. I'd debugged the menu part there, but had all the other changes, including my original menu code, on my server and hadn't copied it back before pushing. Fixes: 0eac99f76ec3 Sponsored by: Netflix --- stand/lua/menu.lua | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/stand/lua/menu.lua b/stand/lua/menu.lua index 66d7fe673023..0587e5ae6586 100644 --- a/stand/lua/menu.lua +++ b/stand/lua/menu.lua @@ -245,7 +245,6 @@ menu.welcome = { boot_entry_1, boot_entry_2 = multi_user, single_user end return { - loader_needs_upgrade, boot_entry_1, boot_entry_2, menu_entries.prompt, @@ -264,6 +263,10 @@ menu.welcome = { menu_entries.boot_envs, menu_entries.chainload, menu_entries.vendor, + { + entry_type = core.MENU_SEPARATOR, + }, + menu_entries.loader_needs_upgrade, } end, all_entries = { @@ -415,8 +418,8 @@ menu.welcome = { loader_needs_upgrade = { entry_type = core.MENU_SEPARATOR, name = function() - return "Loader requires updating" - end + return color.highlight("Loader needs to be updated") + end, visible = function() return core.loaderTooOld() end