From owner-svn-src-all@freebsd.org Fri Jun 5 02:52:08 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 345A633C19F; Fri, 5 Jun 2020 02:52:08 +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.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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49dRy00fPWz3TxV; Fri, 5 Jun 2020 02:52:08 +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 118BD9FB9; Fri, 5 Jun 2020 02:52:08 +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 0552q7J3009658; Fri, 5 Jun 2020 02:52:07 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0552q7np009657; Fri, 5 Jun 2020 02:52:07 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202006050252.0552q7np009657@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Fri, 5 Jun 2020 02:52:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r361817 - in stable: 11/stand/lua 12/stand/lua X-SVN-Group: stable-12 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in stable: 11/stand/lua 12/stand/lua X-SVN-Commit-Revision: 361817 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 02:52:08 -0000 Author: kevans Date: Fri Jun 5 02:52:07 2020 New Revision: 361817 URL: https://svnweb.freebsd.org/changeset/base/361817 Log: MFC r361709: lualoader: improve drawer error handling At least one user has landed in a scenario where logo files appear to be misnamed, and we failed to find them. Our fallback for missing logodefs is orb/orbbw, based on the color status. In a scenario where we can't locate the logos, though, this is not ideal. Add in one more layer of fallback to properly just don't draw any logo if the fan has been jam packed with foreign material. PR: 246046 Modified: stable/12/stand/lua/drawer.lua Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Modified: stable/11/stand/lua/drawer.lua Directory Properties: stable/11/ (props changed) Modified: stable/12/stand/lua/drawer.lua ============================================================================== --- stable/12/stand/lua/drawer.lua Fri Jun 5 02:21:46 2020 (r361816) +++ stable/12/stand/lua/drawer.lua Fri Jun 5 02:52:07 2020 (r361817) @@ -258,6 +258,11 @@ local function drawlogo() else logodef = getLogodef(drawer.default_bw_logodef) end + + -- Something has gone terribly wrong. + if logodef == nil then + logodef = getLogodef(drawer.default_fallback_logodef) + end end if logodef ~= nil and logodef.graphic == none then @@ -355,6 +360,9 @@ shift = default_shift drawer.default_brand = 'fbsd' drawer.default_color_logodef = 'orb' drawer.default_bw_logodef = 'orbbw' +-- For when things go terribly wrong; this def should be present here in the +-- drawer module in case it's a filesystem issue. +drawer.default_fallback_logodef = 'none' function drawer.addBrand(name, def) branddefs[name] = def