Index: projects/lua-bootloader/sys/boot/lua/config.lua =================================================================== --- projects/lua-bootloader/sys/boot/lua/config.lua (revision 281239) +++ projects/lua-bootloader/sys/boot/lua/config.lua (revision 281240) @@ -1,347 +1,347 @@ -- -- 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$ -- config = {}; modules = {}; function config.setKey(k, n, v) if modules[k] == nil then modules[k] = {}; end modules[k][n] = v; end pattern_table = { [1] = { str = "^%s*(#.*)", process = function(k, v) end }, -- module_load="value" [2] = { str = "^%s*([%w_]+)_load%s*=%s*\"([%w%s%p]-)\"%s*(.*)", process = function(k, v) if modules[k] == nil then modules[k] = {}; end modules[k].load = string.upper(v); end }, -- module_name="value" [3] = { str = "^%s*([%w_]+)_name%s*=%s*\"([%w%s%p]-)\"%s*(.*)", process = function(k, v) config.setKey(k, "name", v); end }, -- module_type="value" [4] = { str = "^%s*([%w_]+)_type%s*=%s*\"([%w%s%p]-)\"%s*(.*)", process = function(k, v) config.setKey(k, "type", v); end }, -- module_flags="value" [5] = { str = "^%s*([%w_]+)_flags%s*=%s*\"([%w%s%p]-)\"%s*(.*)", process = function(k, v) config.setKey(k, "flags", v); end }, -- module_before="value" [6] = { str = "^%s*([%w_]+)_before%s*=%s*\"([%w%s%p]-)\"%s*(.*)", process = function(k, v) config.setKey(k, "before", v); end }, -- module_after="value" [7] = { str = "^%s*([%w_]+)_after%s*=%s*\"([%w%s%p]-)\"%s*(.*)", process = function(k, v) config.setKey(k, "after", v); end }, -- module_error="value" [8] = { str = "^%s*([%w_]+)_error%s*=%s*\"([%w%s%p]-)\"%s*(.*)", process = function(k, v) config.setKey(k, "error", v); end }, -- exec="command" [9] = { str = "^%s*exec%s*=%s*\"([%w%s%p]-)\"%s*(.*)", process = function(k, v) if loader.perform(k) ~= 0 then - print("Failed to exec '"..k.."'\n"); + print("Failed to exec '"..k.."'"); end end }, -- env_var="value" [10] = { str = "^%s*([%w%p]+)%s*=%s*\"([%w%s%p]-)\"%s*(.*)", process = function(k, v) if loader.perform("set "..k.."=\""..v.."\"") ~= 0 then - print("Failed to set '"..k.."' with value: "..v.."\n"); + print("Failed to set '"..k.."' with value: "..v..""); end end }, -- env_var=num [11] = { str = "^%s*([%w%p]+)%s*=%s*(%d+)%s*(.*)", process = function(k, v) if loader.perform("set "..k.."="..v.."") ~= 0 then - print("Failed to set '"..k.."' with value: "..v.."\n"); + print("Failed to set '"..k.."' with value: "..v..""); end end } }; function config.isValidComment(c) if c ~= nil then local s = string.match(c, "^%s*#.*"); if s == nil then s = string.match(c, "^%s*$"); end if s == nil then return false; end end return true; end function config.loadmod(mod, silent) local status = true; for k, v in pairs(mod) do if v.load == "YES" then local str = "load "; if v.flags ~= nil then str = str .. v.flags .. " "; end if v.type ~= nil then str = str .. "-t " .. v.type .. " "; end if v.name ~= nil then str = str .. v.name; else str = str .. k; end if v.before ~= nil then if loader.perform(v.before) ~= 0 then if not silent then - print("Failed to execute '"..v.before.."' before loading '"..k.."'\n"); + print("Failed to execute '"..v.before.."' before loading '"..k.."'"); end status = false; end end if loader.perform(str) ~= 0 then - if not silent then print("Failed to execute '" .. str .. "'\n"); end + if not silent then print("Failed to execute '" .. str .. "'"); end if v.error ~= nil then loader.perform(v.error); end status = false; end if v.after ~= nil then if loader.perform(v.after) ~= 0 then if not silent then - print("Failed to execute '"..v.after.."' after loading '"..k.."'\n"); + print("Failed to execute '"..v.after.."' after loading '"..k.."'"); end status = false; end end else - --if not silent then print("Skiping module '".. k .. "'\n"); end + --if not silent then print("Skiping module '".. k .. "'"); end end end return status; end function config.parse(name, silent) local f = io.open(name); if f == nil then - if not silent then print("Failed to open config: '" .. name.."'\n"); end + if not silent then print("Failed to open config: '" .. name.."'"); end return false; end local text; local r; text, r = io.read(f); if text == nil then - if not silent then print("Failed to read config: '" .. name.."'\n"); end + if not silent then print("Failed to read config: '" .. name.."'"); end return false; end local n = 1; local status = true; for line in string.gmatch(text, "([^\n]+)") do if string.match(line, "^%s*$") == nil then local found = false; for i, val in ipairs(pattern_table) do local k, v, c = string.match(line, val.str); if k ~= nil then found = true; if config.isValidComment(c) then val.process(k, v); else - print("Malformed line ("..n.."):\n\t'"..line.."'\n"); + print("Malformed line ("..n.."):\n\t'"..line.."'"); status = false; end break; end end if found == false then - print("Malformed line ("..n.."):\n\t'"..line.."'\n"); + print("Malformed line ("..n.."):\n\t'"..line.."'"); status = false; end end n = n + 1; end return status; end function config.loadkernel() local flags = loader.getenv("kernel_options") or ""; local kernel = loader.getenv("kernel"); local try_load = function (names) for name in names:gmatch("([^;]+)%s*;?") do r = loader.perform("load "..flags.." "..name); if r == 0 then return name; end end return nil; end; local load_bootfile = function() local bootfile = loader.getenv("bootfile"); -- append default kernel name if not bootfile then bootfile = "kernel"; else bootfile = bootfile..";kernel"; end return try_load(bootfile); end; -- kernel not set, try load from default module_path if kernel == nil then local res = load_bootfile(); if res ~= nil then return true; else - print("Failed to load kernel '"..res.."'\n"); + print("Failed to load kernel '"..res.."'"); return false; end else local module_path = loader.getenv("module_path"); local res = nil; -- first try load kernel with module_path = /boot/${kernel} -- then try load with module_path=${kernel} local paths = {"/boot/"..kernel, kernel}; for k,v in pairs(paths) do loader.perform("set module_path="..v); res = load_bootfile(); -- succeeded add path to module_path if res ~= nil then loader.perform("set module_path="..v..";"..module_path); return true; end end -- failed to load with ${kernel} as a directory -- try as a file res = try_load(kernel); if res ~= nil then return true; else - print("Failed to load kernel '"..res.."'\n"); + print("Failed to load kernel '"..res.."'"); return false; end end end function config.load(file) if not file then file = "/boot/defaults/loader.conf"; end if not config.parse(file) then - print("Failed to parse configuration: '"..file.."'\n"); + print("Failed to parse configuration: '"..file.."'"); end local f = loader.getenv("loader_conf_files"); if f ~= nil then for name in string.gmatch(f, "([%w%p]+)%s*") do if not config.parse(name) then - print("Failed to parse configuration: '"..name.."'\n"); + print("Failed to parse configuration: '"..name.."'"); end end end - print("Loading kernel...\n"); + print("Loading kernel..."); config.loadkernel(); - print("Loading configurations...\n"); + print("Loading configurations..."); if not config.loadmod(modules) then - print("Could not load configurations!\n"); + print("Could not load configurations!"); end end function config.reload(kernel) local res = 1; -- unload all modules - print("Unloading modules...\n"); + print("Unloading modules..."); loader.perform("unload"); if kernel ~= nil then res = loader.perform("load "..kernel); if res == 0 then print("Kernel '"..kernel.."' loaded!"); end end -- failed to load kernel or it is nil -- then load default if res == 1 then - print("Loading default kernel...\n"); + print("Loading default kernel..."); config.loadkernel(); end -- load modules config.loadmod(modules); end Index: projects/lua-bootloader/sys/boot/lua/menu.lua =================================================================== --- projects/lua-bootloader/sys/boot/lua/menu.lua (revision 281239) +++ projects/lua-bootloader/sys/boot/lua/menu.lua (revision 281240) @@ -1,311 +1,311 @@ -- -- 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$ -- include("/boot/core.lua"); include("/boot/config.lua"); include("/boot/screen.lua"); include("/boot/drawer.lua"); menu = {}; function menu.draw(x, y, opts) screen.setcursor(x, y); print("Boot Menu"); for k, v in pairs(opts) do -- skip alias if k ~= "alias" then screen.setcursor(x, y + v.index); local name = v.name; if (name == nil) then name = v.getName(); end print(k .. " - " .. name); end end 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 ""); return c == "yes"; end function menu.run(opts) if menu.skip() then core.autoboot(); return; end if (opts == nil) then opts = menu.options; end local draw = function() screen.clear(); menu.draw(6, 11, opts); menu.drawbox(4, 10, 40, 10); drawer.drawbrand(); drawer.drawlogo(); screen.defcursor(); end draw(); menu.autoboot(); while true do local ch = string.char(io.getchar()); if (opts[ch] ~= nil) then local ret = opts[ch].func(); if (ret) then - print("Exiting menu!\n"); + print("Exiting menu!"); return; end else --try alias key if opts.alias ~= nil then if opts.alias[ch] ~= nil then local ret = opts.alias[ch].func(); if (ret) then - print("Exiting menu!\n"); + print("Exiting menu!"); return; end end end end draw(); end end function menu.drawbox(x, y, w, 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); screen.setcursor(x+1, y); for i = 0, w-2 do print(hl); end screen.setcursor(x+1, y+h); for i = 0, w-2 do print(hl); end for i = 1, h-1 do screen.setcursor(x, y+i); print(vl); end for i = 1, h-1 do screen.setcursor(x+w, y+i); print(vl); end 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 == 13 then break; else -- prevent autoboot when escaping to interpreter loader.perform("set 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 menu.options = { -- Boot multi user ["1"] = { index = 1, name = "Boot Multi user "..color.highlight("[Enter]"), func = function () core.setSingleUser(false); core.boot(); end }, -- boot single user ["2"] = { index = 2, name = "Boot "..color.highlight("S").."ingle user", func = function () core.setSingleUser(true); core.boot(); end }, -- escape to interpreter ["3"] = { index = 3, name = color.highlight("Esc").."ape to lua interpreter", func = function () return true; end }, -- reboot ["4"] = { index = 4, name = color.highlight("R").."eboot", func = function () loader.perform("reboot"); end }, -- boot options ["5"] = { index = 5, name = "Boot "..color.highlight("O").."ptions", func = function () menu.run(boot_options); return false; end }, ["6"] = { index = 6, getName = function () local k = core.kernelList(); if #k == 0 then return "Kernels (not availabe)"; end return "Kernels"; end, func = function() local kernels = {}; local ker = core.kernelList(); if #ker == 0 then return false; end kernels["1"] = { index = 1, name = "Return to menu "..color.highlight("[Backspace]"), func = function() return true; end }; kernels.alias = {["\008"] = kernels["1"]}; for k, v in ipairs(ker) do kernels[tostring(k+1)] = { index = k+1, name = v, func = function() config.reload(v); end }; end menu.run(kernels); return false; end } }; menu.options.alias = { ["\013"] = menu.options["1"], ["s"] = menu.options["2"], ["\027"] = menu.options["3"], ["r"] = menu.options["4"], ["o"] = menu.options["5"] }; 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 boot_options = { ["1"] = { index = 1, name = "Back to menu"..color.highlight(" [Backspace]"), func = function () return true; end }, ["2"] = { index = 2, name = "Load System "..color.highlight("D").."efaults", func = function () core.setDefaults(); return false; end }, ["3"] = { index = 3, getName = function () return OnOff(color.highlight("A").."CPI :", core.acpi); end, func = function () core.setACPI(); return false; end }, ["4"] = { index = 4, getName = function () return OnOff("Safe "..color.highlight("M").."ode :", core.sm); end, func = function () core.setSafeMode(); return false; end }, ["5"] = { index = 5, getName = function () return OnOff(color.highlight("S").."ingle user:", core.su); end, func = function () core.setSingleUser(); return false; end }, ["6"] = { index = 6, getName = function () return OnOff(color.highlight("V").."erbose :", core.verbose); end, func = function () core.setVerbose(); return false; end } } boot_options.alias = { ["\08"] = boot_options["1"], ["d"] = boot_options["2"], ["a"] = boot_options["3"], ["m"] = boot_options["4"], ["s"] = boot_options["5"], ["v"] = boot_options["6"] };