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

stand/lua: Don't reload kernel config if we only have one kernel

Browse Source 
Don't move this into config.reload because we may want to force reloads if
/boot changes out from under us later.

As a caution: changing kernels in lualoader at the moment might not be
loading all of your modules (in my testing, at least) from loader.conf(5).
This is a known problem.
This commit is contained in:
kevans 2018-02-16 22:57:52 +00:00
parent 0d56978e23
commit 8b1e57e44f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
stand/lua/menu.lua
View File

@ -213,8 +213,10 @@ menu.welcome = {
" (" .. idx ..
" of " .. #all_choices .. ")";
end,
func = function(choice)
config.reload(choice);
func = function(choice, all_choices)
if (#all_choices > 1) then
config.reload(choice);
end
end,
alias = {"k", "K"}
},
@ -300,7 +302,8 @@ function menu.run(m)
if (#choices > 0) then
caridx = (caridx % #choices) + 1;
menu.setCarouselIndex(carid, caridx);
sel_entry.func(choices[caridx]);
sel_entry.func(choices[caridx],
choices);
end
elseif (sel_entry.entry_type == core.MENU_SUBMENU) then
-- recurse