Index: head/stand/lua/core.lua =================================================================== --- head/stand/lua/core.lua (revision 329367) +++ head/stand/lua/core.lua (revision 329368) @@ -1,175 +1,182 @@ -- -- Copyright (c) 2015 Pedro Souza -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without -- modification, are permitted provided that the following conditions -- are met: -- 1. Redistributions of source code must retain the above copyright -- notice, this list of conditions and the following disclaimer. -- 2. Redistributions in binary form must reproduce the above copyright -- notice, this list of conditions and the following disclaimer in the -- documentation and/or other materials provided with the distribution. -- -- THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -- ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- -- $FreeBSD$ -- local core = {}; -- Commonly appearing constants -core.KEY_ENTER = 13; -core.KEY_BACKSPACE = 127; +core.KEY_ENTER = 13; +core.KEY_BACKSPACE = 127; -core.KEYSTR_ESCAPE = "\027"; +core.KEYSTR_ESCAPE = "\027"; +core.MENU_RETURN = "return"; +core.MENU_ENTRY = "entry"; +core.MENU_SEPARATOR = "separator"; +core.MENU_SUBMENU = "submenu"; +core.MENU_CAROUSEL_ENTRY = "carousel_entry"; + function core.setVerbose(b) if (b == nil) then b = not core.verbose; end if (b == true) then loader.setenv("boot_verbose", "YES"); else loader.unsetenv("boot_verbose"); end core.verbose = b; end function core.setSingleUser(b) if (b == nil) then b = not core.su; end if (b == true) then loader.setenv("boot_single", "YES"); else loader.unsetenv("boot_single"); end core.su = b; end function core.getACPIPresent(checkingSystemDefaults) local c = loader.getenv("hint.acpi.0.rsdp"); if (c ~= nil) then if (checkingSystemDefaults == true) then return true; end -- Otherwise, respect disabled if it's set c = loader.getenv("hint.acpi.0.disabled"); return (c == nil) or (tonumber(c) ~= 1); end return false; end function core.setACPI(b) if (b == nil) then b = not core.acpi; end if (b == true) then loader.setenv("acpi_load", "YES"); loader.setenv("hint.acpi.0.disabled", "0"); loader.unsetenv("loader.acpi_disabled_by_user"); else loader.unsetenv("acpi_load"); loader.setenv("hint.acpi.0.disabled", "1"); loader.setenv("loader.acpi_disabled_by_user", "1"); end core.acpi = b; end function core.setSafeMode(b) if (b == nil) then b = not core.sm; end if (b == true) then loader.setenv("kern.smp.disabled", "1"); loader.setenv("hw.ata.ata_dma", "0"); loader.setenv("hw.ata.atapi_dma", "0"); loader.setenv("hw.ata.wc", "0"); loader.setenv("hw.eisa_slots", "0"); loader.setenv("kern.eventtimer.periodic", "1"); loader.setenv("kern.geom.part.check_integrity", "0"); else loader.unsetenv("kern.smp.disabled"); loader.unsetenv("hw.ata.ata_dma"); loader.unsetenv("hw.ata.atapi_dma"); loader.unsetenv("hw.ata.wc"); loader.unsetenv("hw.eisa_slots"); loader.unsetenv("kern.eventtimer.periodic"); loader.unsetenv("kern.geom.part.check_integrity"); end core.sm = b; end function core.kernelList() local k = loader.getenv("kernel"); local v = loader.getenv("kernels") or ""; + v = "kernel;kernel.GENERIC" local kernels = {}; local i = 0; if k ~= nil then i = i + 1; kernels[i] = k; end for n in v:gmatch("([^; ]+)[; ]?") do if n ~= k then i = i + 1; kernels[i] = n; end end return kernels; end function core.setDefaults() core.setACPI(core.getACPIPresent(true)); core.setSafeMode(false); core.setSingleUser(false); core.setVerbose(false); end function core.autoboot() loader.perform("autoboot"); end function core.boot() loader.perform("boot"); end function core.bootserial() local c = loader.getenv("console"); if c ~= nil then if c:find("comconsole") ~= nil then return true; end end local s = loader.getenv("boot_serial"); if s ~= nil then return true; end local m = loader.getenv("boot_multicons"); if m ~= nil then return true; end return false; end core.setACPI(core.getACPIPresent(false)) return core Index: head/stand/lua/drawer.lua =================================================================== --- head/stand/lua/drawer.lua (revision 329367) +++ head/stand/lua/drawer.lua (revision 329368) @@ -1,325 +1,326 @@ -- -- Copyright (c) 2015 Pedro Souza -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without -- modification, are permitted provided that the following conditions -- are met: -- 1. Redistributions of source code must retain the above copyright -- notice, this list of conditions and the following disclaimer. -- 2. Redistributions in binary form must reproduce the above copyright -- notice, this list of conditions and the following disclaimer in the -- documentation and/or other materials provided with the distribution. -- -- THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -- ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- -- $FreeBSD$ -- local drawer = {}; local color = require("color"); +local core = require("core"); local screen = require("screen"); drawer.brand_position = {x = 2, y = 1}; drawer.fbsd_logo = { " ______ ____ _____ _____ ", " | ____| | _ \\ / ____| __ \\ ", " | |___ _ __ ___ ___ | |_) | (___ | | | |", " | ___| '__/ _ \\/ _ \\| _ < \\___ \\| | | |", " | | | | | __/ __/| |_) |____) | |__| |", " | | | | | | || | | |", " |_| |_| \\___|\\___||____/|_____/|_____/ " }; drawer.logo_position = {x = 46, y = 1}; drawer.beastie_color = { " \027[31m, ,", " /( )`", " \\ \\___ / |", " /- \027[37m_\027[31m `-/ '", " (\027[37m/\\/ \\\027[31m \\ /\\", " \027[37m/ / |\027[31m ` \\", " \027[34mO O \027[37m) \027[31m/ |", " \027[37m`-^--'\027[31m`< '", " (_.) _ ) /", " `.___/` /", " `-----' /", " \027[33m<----.\027[31m __ / __ \\", " \027[33m<----|====\027[31mO)))\027[33m==\027[31m) \\) /\027[33m====|", " \027[33m<----'\027[31m `--' `.__,' \\", " | |", " \\ / /\\", " \027[36m______\027[31m( (_ / \\______/", " \027[36m,' ,-----' |", " `--{__________)\027[37m" }; drawer.beastie = { " , ,", " /( )`", " \\ \\___ / |", " /- _ `-/ '", " (/\\/ \\ \\ /\\", " / / | ` \\", " O O ) / |", " `-^--'`< '", " (_.) _ ) /", " `.___/` /", " `-----' /", " <----. __ / __ \\", " <----|====O)))==) \\) /====|", " <----' `--' `.__,' \\", " | |", " \\ / /\\", " ______( (_ / \\______/", " ,' ,-----' |", " `--{__________)" }; drawer.fbsd_logo_shift = {x = 5, y = 4}; drawer.fbsd_logo_v = { " ______", " | ____| __ ___ ___ ", " | |__ | '__/ _ \\/ _ \\", " | __|| | | __/ __/", " | | | | | | |", " |_| |_| \\___|\\___|", " ____ _____ _____", " | _ \\ / ____| __ \\", " | |_) | (___ | | | |", " | _ < \\___ \\| | | |", " | |_) |____) | |__| |", " | | | |", " |____/|_____/|_____/" }; drawer.orb_shift = {x = 2, y = 4}; drawer.orb_color = { " \027[31m``` \027[31;1m`\027[31m", " s` `.....---...\027[31;1m....--.``` -/\027[31m", " +o .--` \027[31;1m/y:` +.\027[31m", " yo`:. \027[31;1m:o `+-\027[31m", " y/ \027[31;1m-/` -o/\027[31m", " .- \027[31;1m::/sy+:.\027[31m", " / \027[31;1m`-- /\027[31m", " `: \027[31;1m:`\027[31m", " `: \027[31;1m:`\027[31m", " / \027[31;1m/\027[31m", " .- \027[31;1m-.\027[31m", " -- \027[31;1m-.\027[31m", " `:` \027[31;1m`:`", " \027[31;1m.-- `--.", " .---.....----.\027[37m" }; drawer.orb = { " ``` `", " s` `.....---.......--.``` -/", " +o .--` /y:` +.", " yo`:. :o `+-", " y/ -/` -o/", " .- ::/sy+:.", " / `-- /", " `: :`", " `: :`", " / /", " .- -.", " -- -.", " `:` `:`", " .-- `--.", " .---.....----." }; drawer.none = {""}; drawer.none_shift = {x = 17, y = 0}; drawer.menu_position = {x = 6, y = 11}; drawer.box_pos_dim = {x = 3, y = 10, w = 41, h = 11}; function drawer.drawscreen(menu_opts) -- drawlogo() must go first. -- it determines the positions of other elements drawer.drawlogo(); drawer.drawbrand(); drawer.drawbox(); return drawer.drawmenu(menu_opts); end function drawer.drawmenu(m) x = drawer.menu_position.x; y = drawer.menu_position.y; -- print the menu and build the alias table local alias_table = {}; local entry_num = 0; for line_num, e in ipairs(m) do - if (e.entry_type ~= "separator") then + if (e.entry_type ~= core.MENU_SEPARATOR) then entry_num = entry_num + 1; screen.setcursor(x, y + line_num); local name = ""; - if (e.entry_type == "carousel_entry") then + if (e.entry_type == core.MENU_CAROUSEL_ENTRY) then local carid = e.carousel_id; local caridx = menu.getCarouselIndex(carid); local choices = e.items(); if (#choices < caridx) then caridx = 1; end; name = e.name(caridx, choices[caridx], choices); else name = e.name(); end print(entry_num .. ". "..name); -- fill the alias table alias_table[tostring(entry_num)] = e; if (e.alias ~= nil) then for n, a in ipairs(e.alias) do alias_table[a] = e; end end else screen.setcursor(x, y + line_num); print(e.name()); end end return alias_table; end function drawer.drawbox() x = drawer.box_pos_dim.x; y = drawer.box_pos_dim.y; w = drawer.box_pos_dim.w; h = drawer.box_pos_dim.h; local hl = string.char(0xCD); local vl = string.char(0xBA); local tl = string.char(0xC9); local bl = string.char(0xC8); local tr = string.char(0xBB); local br = string.char(0xBC); screen.setcursor(x, y); print(tl); screen.setcursor(x, y+h); print(bl); screen.setcursor(x+w, y); print(tr); screen.setcursor(x+w, y+h); print(br); for i = 1, w-1 do screen.setcursor(x+i, y); print(hl); screen.setcursor(x+i, y+h); print(hl); end for i = 1, h-1 do screen.setcursor(x, y+i); print(vl); screen.setcursor(x+w, y+i); print(vl); end screen.setcursor(x+(w/2)-9, y); print("Welcome to FreeBSD"); end function drawer.draw(x, y, logo) for i = 1, #logo do screen.setcursor(x, y + i); print(logo[i]); end end function drawer.drawbrand() local x = tonumber(loader.getenv("loader_brand_x")); local y = tonumber(loader.getenv("loader_brand_y")); if not x then x = drawer.brand_position.x; end if not y then y = drawer.brand_position.y; end local logo = load("return " .. tostring(loader.getenv("loader_brand")))(); if not logo then logo = drawer.fbsd_logo; end drawer.draw(x, y, logo); end function drawer.drawlogo() local x = tonumber(loader.getenv("loader_logo_x")); local y = tonumber(loader.getenv("loader_logo_y")); if not x then x = drawer.logo_position.x; end if not y then y = drawer.logo_position.y; end local logo = loader.getenv("loader_logo"); local s = {x = 0, y = 0}; local colored = color.isEnabled(); if logo == "beastie" then if colored then logo = drawer.beastie_color; end elseif logo == "beastiebw" then logo = drawer.beastie; elseif logo == "fbsdbw" then logo = drawer.fbsd_logo_v; s = drawer.fbsd_logo_shift; elseif logo == "orb" then if colored then logo = drawer.orb_color; end s = drawer.orb_shift; elseif logo == "orbbw" then logo = drawer.orb; s = drawer.orb_shift; elseif logo == "tribute" then logo = drawer.fbsd_logo; elseif logo == "tributebw" then logo = drawer.fbsd_logo; elseif logo == "none" then --centre brand and text if no logo drawer.brand_position.x = drawer.brand_position.x + drawer.none_shift.x; drawer.brand_position.y = drawer.brand_position.y + drawer.none_shift.y; drawer.menu_position.x = drawer.menu_position.x + drawer.none_shift.x; drawer.menu_position.y = drawer.menu_position.y + drawer.none_shift.y; drawer.box_pos_dim.x = drawer.box_pos_dim.x + drawer.none_shift.x; drawer.box_pos_dim.y = drawer.box_pos_dim.y + drawer.none_shift.y; --prevent redraws from moving menu further drawer.none_shift.x = 0; drawer.none_shift.y = 0; logo = drawer.none; end if not logo then if colored then logo = drawer.orb_color; else logo = drawer.orb; end end drawer.draw(x + s.x, y + s.y, logo); end return drawer Index: head/stand/lua/menu.lua =================================================================== --- head/stand/lua/menu.lua (revision 329367) +++ head/stand/lua/menu.lua (revision 329368) @@ -1,390 +1,390 @@ -- -- Copyright (c) 2015 Pedro Souza -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without -- modification, are permitted provided that the following conditions -- are met: -- 1. Redistributions of source code must retain the above copyright -- notice, this list of conditions and the following disclaimer. -- 2. Redistributions in binary form must reproduce the above copyright -- notice, this list of conditions and the following disclaimer in the -- documentation and/or other materials provided with the distribution. -- -- THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -- ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- -- $FreeBSD$ -- local menu = {}; local core = require("core"); local color = require("color"); local config = require("config"); local screen = require("screen"); local drawer = require("drawer"); local OnOff; local skip; local run; local autoboot; local carousel_choices = {}; --loader menu tree: --rooted at menu.welcome --submenu declarations: local boot_options; local welcome; menu.boot_options = { -- return to welcome menu { - entry_type = "return", + entry_type = core.MENU_RETURN, name = function() return "Back to main menu"..color.highlight(" [Backspace]"); end }, -- load defaults { - entry_type = "entry", + entry_type = core.MENU_ENTRY, name = function() return "Load System "..color.highlight("D").."efaults"; end, func = function() core.setDefaults() end, alias = {"d", "D"} }, { - entry_type = "separator", + entry_type = core.MENU_SEPARATOR, name = function() return ""; end }, { - entry_type = "separator", + entry_type = core.MENU_SEPARATOR, name = function() return "Boot Options:"; end }, -- acpi { - entry_type = "entry", + entry_type = core.MENU_ENTRY, name = function() return OnOff(color.highlight("A").."CPI :", core.acpi); end, func = function() core.setACPI(); end, alias = {"a", "A"} }, -- safe mode { - entry_type = "entry", + entry_type = core.MENU_ENTRY, name = function() return OnOff("Safe "..color.highlight("M").."ode :", core.sm); end, func = function() core.setSafeMode(); end, alias = {"m", "M"} }, -- single user { - entry_type = "entry", + entry_type = core.MENU_ENTRY, name = function() return OnOff(color.highlight("S").."ingle user:", core.su); end, func = function() core.setSingleUser(); end, alias = {"s", "S"} }, -- verbose boot { - entry_type = "entry", + entry_type = core.MENU_ENTRY, name = function() return OnOff(color.highlight("V").."erbose :", core.verbose); end, func = function() core.setVerbose(); end, alias = {"v", "V"} }, }; menu.welcome = { -- boot multi user { - entry_type = "entry", + entry_type = core.MENU_ENTRY, name = function() return color.highlight("B").."oot Multi user "..color.highlight("[Enter]"); end, func = function() core.setSingleUser(false); core.boot(); end, alias = {"b", "B"} }, -- boot single user { - entry_type = "entry", + entry_type = core.MENU_ENTRY, name = function() return "Boot "..color.highlight("S").."ingle user"; end, func = function() core.setSingleUser(true); core.boot(); end, alias = {"s", "S"} }, -- escape to interpreter { - entry_type = "return", + entry_type = core.MENU_RETURN, name = function() return color.highlight("Esc").."ape to loader prompt"; end, alias = {core.KEYSTR_ESCAPE} }, -- reboot { - entry_type = "entry", + entry_type = core.MENU_ENTRY, name = function() return color.highlight("R").."eboot"; end, func = function() loader.perform("reboot"); end, alias = {"r", "R"} }, { - entry_type = "separator", + entry_type = core.MENU_SEPARATOR, name = function() return ""; end }, { - entry_type = "separator", + entry_type = core.MENU_SEPARATOR, name = function() return "Options:"; end }, -- kernel options { - entry_type = "carousel_entry", + entry_type = core.MENU_CAROUSEL_ENTRY, carousel_id = "kernel", items = core.kernelList, name = function(idx, choice, all_choices) if #all_choices == 0 then return "Kernel: "; end local kernel_name = color.escapef(color.GREEN) .. choice .. color.default(); if (idx == 1) then kernel_name = "default/" .. kernel_name; end return color.highlight("K").."ernel: " .. kernel_name .. " (" .. idx .. " of " .. #all_choices .. ")"; end, func = function(choice) config.reload(choice); end, alias = {"k", "K"} }, -- boot options { - entry_type = "submenu", + entry_type = core.MENU_SUBMENU, name = function() return "Boot "..color.highlight("O").."ptions"; end, submenu = function() return menu.boot_options; end, alias = {"o", "O"} } }; -- The first item in every carousel is always the default item. function menu.getCarouselIndex(id) local val = carousel_choices[id]; if (val == nil) then return 1; end return val; end function menu.setCarouselIndex(id, idx) carousel_choices[id] = idx; end function menu.run(m) if (menu.skip()) then core.autoboot(); return false; end if (m == nil) then m = menu.welcome; end -- redraw screen screen.clear(); screen.defcursor(); local alias_table = drawer.drawscreen(m); -- menu.autoboot(); cont = true; while cont do local key = io.getchar(); -- Special key behaviors if (key == core.KEY_BACKSPACE) and (m ~= menu.welcome) then break elseif (key == core.KEY_ENTER) then core.boot(); -- Should not return end key = string.char(key) -- check to see if key is an alias local sel_entry = nil; for k, v in pairs(alias_table) do if (key == k) then sel_entry = v; end end -- if we have an alias do the assigned action: if(sel_entry ~= nil) then - if (sel_entry.entry_type == "entry") then + if (sel_entry.entry_type == core.MENU_ENTRY) then -- run function sel_entry.func(); - elseif (sel_entry.entry_type == "carousel_entry") then + elseif (sel_entry.entry_type == core.MENU_CAROUSEL_ENTRY) then -- carousel (rotating) functionality local carid = sel_entry.carousel_id; local caridx = menu.getCarouselIndex(carid); local choices = sel_entry.items(); caridx = (caridx % #choices) + 1; menu.setCarouselIndex(carid, caridx); sel_entry.func(choices[caridx]); - elseif (sel_entry.entry_type == "submenu") then + elseif (sel_entry.entry_type == core.MENU_SUBMENU) then -- recurse cont = menu.run(sel_entry.submenu()); - elseif (sel_entry.entry_type == "return") then + elseif (sel_entry.entry_type == core.MENU_RETURN) then -- break recurse cont = false; end -- if we got an alias key the screen is out of date: screen.clear(); screen.defcursor(); alias_table = drawer.drawscreen(m); end end if (m == menu.welcome) then screen.defcursor(); print("Exiting menu!"); return false; end return true; end function menu.skip() if core.bootserial() then return true; end local c = string.lower(loader.getenv("console") or ""); if (c:match("^efi[ ;]") or c:match("[ ;]efi[ ;]")) ~= nil then return true; end c = string.lower(loader.getenv("beastie_disable") or ""); print("beastie_disable", c); return c == "yes"; end function menu.autoboot() if menu.already_autoboot == true then return; end menu.already_autoboot = true; local ab = loader.getenv("autoboot_delay"); if ab == "NO" or ab == "no" then core.boot(); end ab = tonumber(ab) or 10; local x = loader.getenv("loader_menu_timeout_x") or 5; local y = loader.getenv("loader_menu_timeout_y") or 22; local endtime = loader.time() + ab; local time; repeat time = endtime - loader.time(); screen.setcursor(x, y); print("Autoboot in "..time.." seconds, hit [Enter] to boot" .." or any other key to stop "); screen.defcursor(); if io.ischar() then local ch = io.getchar(); if ch == core.KEY_ENTER then break; else -- prevent autoboot when escaping to interpreter loader.setenv("autoboot_delay", "NO"); -- erase autoboot msg screen.setcursor(0, y); print(" " .." "); screen.defcursor(); return; end end loader.delay(50000); until time <= 0 core.boot(); end function OnOff(str, b) if (b) then return str .. color.escapef(color.GREEN).."On"..color.escapef(color.WHITE); else return str .. color.escapef(color.RED).."off"..color.escapef(color.WHITE); end end return menu