svn commit: r360423 - head/stand/lua

Kyle Evans kevans at FreeBSD.org
Tue Apr 28 02:08:55 UTC 2020


Author: kevans
Date: Tue Apr 28 02:08:55 2020
New Revision: 360423
URL: https://svnweb.freebsd.org/changeset/base/360423

Log:
  lualoader: cli: clobber loader_conf_files before proceeding
  
  This makes sure that config.readConfFiles doesn't see a stale
  loader_conf_files from before, in case the newly loaded file doesn't set it.
  
  MFC after:	3 days

Modified:
  head/stand/lua/cli.lua

Modified: head/stand/lua/cli.lua
==============================================================================
--- head/stand/lua/cli.lua	Tue Apr 28 02:04:51 2020	(r360422)
+++ head/stand/lua/cli.lua	Tue Apr 28 02:08:55 2020	(r360423)
@@ -127,6 +127,9 @@ end
 
 cli['read-conf'] = function(...)
 	local _, argv = cli.arguments(...)
+	-- Don't trigger a reload of previously loaded loader_conf_files, in
+	-- case this config file doesn't set it.
+	loader.setenv("loader_conf_files", "")
 	config.readConfFiles(assert(core.popFrontTable(argv)), {})
 end
 


More information about the svn-src-all mailing list