system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-06 17:18:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

lualoader: improve drawer error handling

Browse source 
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
MFC after:	3 days
This commit is contained in:
Kyle Evans 2020-06-01 23:26:37 +00:00
parent 41e66f4eca
commit 6697f577d1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=361709
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
stand/lua/drawer.lua
View file

@ -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