loader: Rework kernel menu section
With pkgbase we can have long kernel name, so create a new section for the kernel name. Do not show the "default" text, we already show the "1 of X" part at the end of the line and the default kernel is always number 1 so it's a bit redundant. Differential Revision: https://reviews.freebsd.org/D48354 Reviewed by: imp, tsoome Sponsored by: Beckhoff Automation GmbH & Co. KG
This commit is contained in:
+14
-10
@@ -255,9 +255,16 @@ menu.welcome = {
|
||||
},
|
||||
{
|
||||
entry_type = core.MENU_SEPARATOR,
|
||||
name = "Options:",
|
||||
name = "Kernel:",
|
||||
},
|
||||
menu_entries.kernel_options,
|
||||
{
|
||||
entry_type = core.MENU_SEPARATOR,
|
||||
},
|
||||
{
|
||||
entry_type = core.MENU_SEPARATOR,
|
||||
name = "Options:",
|
||||
},
|
||||
menu_entries.boot_options,
|
||||
menu_entries.zpool_checkpoints,
|
||||
menu_entries.boot_envs,
|
||||
@@ -332,22 +339,19 @@ menu.welcome = {
|
||||
items = core.kernelList,
|
||||
name = function(idx, choice, all_choices)
|
||||
if #all_choices == 0 then
|
||||
return "Kernel: "
|
||||
return ""
|
||||
end
|
||||
|
||||
local is_default = (idx == 1)
|
||||
local kernel_name = ""
|
||||
local kernel_name
|
||||
local name_color
|
||||
if is_default then
|
||||
if idx == 1 then
|
||||
name_color = color.escapefg(color.GREEN)
|
||||
kernel_name = "default/"
|
||||
else
|
||||
name_color = color.escapefg(color.CYAN)
|
||||
end
|
||||
kernel_name = kernel_name .. name_color ..
|
||||
choice .. color.resetfg()
|
||||
return color.highlight("K") .. "ernel: " ..
|
||||
kernel_name .. " (" .. idx .. " of " ..
|
||||
kernel_name = name_color .. choice ..
|
||||
color.resetfg()
|
||||
return kernel_name .. " (" .. idx .. " of " ..
|
||||
#all_choices .. ")"
|
||||
end,
|
||||
func = function(_, choice, _)
|
||||
|
||||
Reference in New Issue
Block a user