From nobody Mon Jul 21 02:13:52 2025 X-Original-To: dev-commits-src-branches@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 4blkTr6bfLz61xfs; Mon, 21 Jul 2025 02:13:52 +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 4blkTr1TNBz3NKK; Mon, 21 Jul 2025 02:13:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753064032; 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=vILUR2NaRtDiSkoQvepMlb4xFjGRrj9k6mnVcYt5bHk=; b=yQJSlrMOPodKM2HBexonOwAbVdcGqCNeconE6ENstNYYtBQaLDjMJKOYQCuijeqND5oSy/ lVoSMUCxks4708bm5TzrH55tV5iIA3B8R3U6HZ+tiYxNzRzKv1/fVZ/p2oNoYrQJyDAJrq Vh5Zm7drLXKoYCASwpe/BaCW75qhgDUNKn/RpR1aG0yKz1pI/2+s6UGVgqTc1pz7vmEoZa vzYAbdCivsdXtp9kE3g66tdU11JbpUYwZmzR7ofx9AK8BhAtCElFuJNbKR5aVQ2rZF8NVw VXhARLfchBKlkpYJwLi9/+nLt/ZeiWJ2CYZ93ySldog9FHPP0jCZtDXqwzDPIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753064032; 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=vILUR2NaRtDiSkoQvepMlb4xFjGRrj9k6mnVcYt5bHk=; b=fQ8Q3UtfFkTdxAXucFybcNeZfNTD0OcGQDiClQixtKnmxiy2i6OYVVgUvPqzFGS9piPt8N 4+Oe3VnOLl5brWeKrgAV89pRLOKkuHn5VT/Ud5dZDgxqHF21WVCWac7lUAx2yHcDTVZG1G dY9Rp8NaybKjIGrfvThDgTn7wFv4iKRseYQijKbODH0W9NAHSQJS854hUvkGRphdZ1XkXk boAW1rtZ7yRd22eoFEYghEs70BN2MqZdcSLjuJ1hguQKJd9EmFVzf+JWRZBPsFBsE6Nd8R fYx59s9cfsV+sFrQfKggHQxk10+6YeBG9FQQKLXVLkYAS4LepXD3T0lExGUpXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753064032; a=rsa-sha256; cv=none; b=ZuIgehiH4HQfZvQHZpf8yLKwE5UPlpXMH3SwoNAIVgncKZfhm+tEvbV0rVeBp920imKr+Y b8xi3/B+Vd0VjNbONEuv2Ovfw6ma5KZEnqb/1+i+9O1q6g3DEvm7DvpEy328ysD+NiT+il WVjktHhTCt270q2y/j7YikRF3Gzw0Iw4et4lxr4pX4ZfJ7ZZMXUtqE+W+U0tCkV0G15IdQ pSwsEByeHCZ0diiQw5uh/zffvuRdgUv7nadV/KY9gBtfj+AQWEksGL3i2BPsC+IGN/HLxd K2jbsgemAhyP/MXP1Ex1LSRDYETALwACw0rjv/pnHaEBfV5h9zc0UOA479Fw5A== 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 4blkTr0tWDzfdN; Mon, 21 Jul 2025 02:13:52 +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 56L2DqHV013724; Mon, 21 Jul 2025 02:13:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56L2Dq7H013721; Mon, 21 Jul 2025 02:13:52 GMT (envelope-from git) Date: Mon, 21 Jul 2025 02:13:52 GMT Message-Id: <202507210213.56L2Dq7H013721@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 8b6be727885d - stable/14 - loader: Fix loader_brand = none List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8b6be727885d1b9eedae4b0e66674dc9cf2b69bb Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=8b6be727885d1b9eedae4b0e66674dc9cf2b69bb commit 8b6be727885d1b9eedae4b0e66674dc9cf2b69bb Author: Emmanuel Vadot AuthorDate: 2025-06-16 12:23:07 +0000 Commit: Kyle Evans CommitDate: 2025-07-21 02:12:26 +0000 loader: Fix loader_brand = none Setting loader_brand to none in loader.conf now result in a lua error as we try to get a non-existant table Defines it Fixes: bef6d85b6de5 ("lualoader: allow graphical bits to be disabled with loader_gfx") Reviewed by: kevans, tsoome Sponsored by: Beckhoff Automation GmbH & Co. KG (cherry picked from commit 7e1930480bef285cca1c14c25b4fd62abdf5dabf) --- stand/lua/drawer.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/lua/drawer.lua b/stand/lua/drawer.lua index 01802d8e9d81..46390590352e 100644 --- a/stand/lua/drawer.lua +++ b/stand/lua/drawer.lua @@ -462,7 +462,7 @@ branddefs = { }, }, ["none"] = { - fb = { image = none }, + ascii = { image = none }, }, }