Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 19 Aug 2018 18:43:11 +0000 (UTC)
From:      Kyle Evans <kevans@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r338067 - head/stand/lua
Message-ID:  <201808191843.w7JIhBJh088194@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kevans
Date: Sun Aug 19 18:43:10 2018
New Revision: 338067
URL: https://svnweb.freebsd.org/changeset/base/338067

Log:
  lualoader: Add drawer-exported variables for default logodefs
  
  Uncovered while writing the documentation from this, we previously
  explicitly fell back to orb or orbbw if an invalid or incompatible logodef
  was selected -- in contrast to branddefs, which have an exported variable
  that one can whip up a quick local.lua to override in a safe manner that
  works regardless of whether or not loader.conf(5) successfully loads.

Modified:
  head/stand/lua/drawer.lua

Modified: head/stand/lua/drawer.lua
==============================================================================
--- head/stand/lua/drawer.lua	Sun Aug 19 18:37:33 2018	(r338066)
+++ head/stand/lua/drawer.lua	Sun Aug 19 18:43:10 2018	(r338067)
@@ -247,9 +247,9 @@ local function drawlogo()
 	    (not colored and logodef.requires_color) then
 		-- Choose a sensible default
 		if colored then
-			logodef = getLogodef("orb")
+			logodef = getLogodef(drawer.default_color_logodef)
 		else
-			logodef = getLogodef("orbbw")
+			logodef = getLogodef(drawer.default_bw_logodef)
 		end
 	end
 
@@ -346,6 +346,8 @@ shift = default_shift
 
 -- Module exports
 drawer.default_brand = 'fbsd'
+drawer.default_color_logodef = 'orb'
+drawer.default_bw_logodef = 'orbbw'
 
 function drawer.addBrand(name, def)
 	branddefs[name] = def



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808191843.w7JIhBJh088194>