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.
This commit is contained in:
Kyle Evans 2018-02-19 03:59:26 +00:00
parent d45913016b
commit 27dd7ddf99
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=329551

View File

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