Date: Tue, 28 Apr 2020 02:08:55 +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: r360423 - head/stand/lua Message-ID: <202004280208.03S28t2s063900@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004280208.03S28t2s063900>