Date: Fri, 16 Feb 2018 22:57:52 +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: r329415 - head/stand/lua Message-ID: <201802162257.w1GMvqBN084675@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Fri Feb 16 22:57:52 2018 New Revision: 329415 URL: https://svnweb.freebsd.org/changeset/base/329415 Log: stand/lua: Don't reload kernel config if we only have one kernel 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. Modified: head/stand/lua/menu.lua Modified: head/stand/lua/menu.lua ============================================================================== --- head/stand/lua/menu.lua Fri Feb 16 22:51:08 2018 (r329414) +++ head/stand/lua/menu.lua Fri Feb 16 22:57:52 2018 (r329415) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802162257.w1GMvqBN084675>