svn commit: r329551 - head/stand/lua

[Kyle Evans]

Author: kevans
Date: Mon Feb 19 03:59:26 2018
New Revision: 329551
URL: https://svnweb.freebsd.org/changeset/base/329551

Log:
  stand/lua: reload previously loaded kernel at config-load/reload
  
  r329550 introduced config.kernel_loaded. config.load() doesn't provide a
  means of overriding the kernel to load, but that likely isn't necessary as
  it will not be a common case. When loading the kernel, just attempt to load
  the kernel previously loaded and specified in config.kernel_loaded.
  
  If we haven't loaded a kernel yet, config.kernel_loaded will be unset/nil
  and the "default"/first kernel found will be loaded. If we've loaded a
  kernel, we'll try to load that same kernel again and fallback to the default
  kernel if we need to.
  
  This in also in support of upcoming boot environment support.

Modified:
  head/stand/lua/config.lua

Modified: head/stand/lua/config.lua
==============================================================================
--- head/stand/lua/config.lua	Mon Feb 19 03:52:02 2018	(r329550)
+++ head/stand/lua/config.lua	Mon Feb 19 03:59:26 2018	(r329551)
@@ -369,7 +369,7 @@ function config.load(file)
 	config.module_path = loader.getenv("module_path");
 
 	print("Loading kernel...");
-	config.loadkernel();
+	config.loadkernel(config.kernel_loaded);
 
 	print("Loading configured modules...");
 	if (not config.loadmod(modules)) then