From owner-svn-src-head@freebsd.org Tue Feb 20 05:06:12 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E5D4DF01E30; Tue, 20 Feb 2018 05:06:11 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 96B1E821BD; Tue, 20 Feb 2018 05:06:11 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 91B3224D12; Tue, 20 Feb 2018 05:06:11 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1K56B3Q083639; Tue, 20 Feb 2018 05:06:11 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1K56BDg083638; Tue, 20 Feb 2018 05:06:11 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201802200506.w1K56BDg083638@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Tue, 20 Feb 2018 05:06:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r329627 - head/stand/lua X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/stand/lua X-SVN-Commit-Revision: 329627 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Feb 2018 05:06:12 -0000 Author: kevans Date: Tue Feb 20 05:06:11 2018 New Revision: 329627 URL: https://svnweb.freebsd.org/changeset/base/329627 Log: stand/lua: Refactor brands into drawer.branddefs Modified: head/stand/lua/drawer.lua Modified: head/stand/lua/drawer.lua ============================================================================== --- head/stand/lua/drawer.lua Tue Feb 20 04:56:03 2018 (r329626) +++ head/stand/lua/drawer.lua Tue Feb 20 05:06:11 2018 (r329627) @@ -171,6 +171,15 @@ orb = { none = {""}; +drawer.branddefs = { + ["fbsd"] = { + graphic = fbsd_logo, + }, + ["none"] = { + graphic = none, + }, +}; + drawer.logodefs = { -- Indexed by valid values for loader_logo in loader.conf(5). Valid keys -- are: requires_color (boolean), logo (table depicting graphic), and @@ -315,9 +324,11 @@ function drawer.drawbrand() local y = tonumber(loader.getenv("loader_brand_y")) or drawer.brand_position.y; - local logo = load("return " .. tostring(loader.getenv("loader_brand")))() or - fbsd_logo; - drawer.draw(x, y, logo); + local graphic = drawer.branddefs[loader.getenv("loader_brand")]; + if (graphic == nil) then + graphic = fbsd_logo; + end + drawer.draw(x, y, graphic); end function shift_brand_text(shift)