d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stand/lua: Try to load alternate kernels as directories first

Browse Source 
This is the procedure that config.loadkernel tries to go through, but
reloading kernel config didn't use this function. Amend config.loadkernel to
take an optional other_kernel.

While here, be a little more verbose ("Trying to load kernel") so that it's
easy to follow where we've gone wrong.
This commit is contained in:
Kyle Evans 2018-02-17 05:02:38 +00:00
parent 4d290ffb2d
commit 18c286a0ac
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=329432
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
stand/lua/config.lua
View File

@ -253,9 +253,11 @@ function config.parse(name, silent)
return status;
end
function config.loadkernel()
-- other_kernel is optionally the name of a kernel to load, if not the default
-- or autoloaded default from the module_path
function config.loadkernel(other_kernel)
local flags = loader.getenv("kernel_options") or "";
local kernel = loader.getenv("kernel");
local kernel = other_kernel or loader.getenv("kernel");
local try_load = function (names)
for name in names:gmatch("([^;]+)%s*;?") do
@ -265,7 +267,7 @@ function config.loadkernel()
end
end
return nil;
end;
end
local load_bootfile = function()
local bootfile = loader.getenv("bootfile");
@ -294,6 +296,9 @@ function config.loadkernel()
local module_path = loader.getenv("module_path");
local res = nil;
if other_kern ~= nil then
kernel = other_kern;
end
-- first try load kernel with module_path = /boot/${kernel}
-- then try load with module_path=${kernel}
local paths = {"/boot/"..kernel, kernel};
@ -355,22 +360,23 @@ function config.load(file)
end
function config.reload(kernel)
local res = 1;
local kernel_loaded = false;
-- unload all modules
print("Unloading modules...");
loader.perform("unload");
if kernel ~= nil then
res = loader.perform("load "..kernel);
if res == 0 then
if (kernel ~= nil) then
print("Trying to load '" .. kernel .. "'")
kernel_loaded = config.loadkernel(kernel);
if (kernel_loaded) then
print("Kernel '"..kernel.."' loaded!");
end
end
-- failed to load kernel or it is nil
-- then load default
if res == 1 then
if (not kernel_loaded) then
print("Loading default kernel...");
config.loadkernel();
end