From f0cb3b6b258df56324123c8732a9b5470a88383c Mon Sep 17 00:00:00 2001
From: Kyle Evans <kevans@FreeBSD.org>
Date: Tue, 20 Feb 2018 21:32:36 +0000
Subject: [PATCH] lualoader: Intercept boot cli command

This should be functional and roughly equivalent to the Forth version.

Stop doing a loadelf() on menu exit now that we can DTRT with boot
invocations. autoboot interception will follow not long after.
---
 stand/lua/core.lua | 32 ++++++++++++++++++++++++++++++++
 stand/lua/menu.lua |  1 -
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/stand/lua/core.lua b/stand/lua/core.lua
index e9c96a86ccbd..2f8c3f093865 100644
--- a/stand/lua/core.lua
+++ b/stand/lua/core.lua
@@ -37,6 +37,38 @@ local compose_loader_cmd = function(cmd_name, argstr)
 	return cmd_name;
 end
 
+-- Parses arguments to boot and returns two values: kernel_name, argstr
+-- Defaults to nil and "" respectively.
+local parse_boot_args = function(argv)
+	if (#argv == 0) then
+		return nil, "";
+	end
+	local kernel_name;
+	local argstr = "";
+
+	for k, v in ipairs(argv) do
+		if (v:sub(1,1) ~= "-") then
+			kernel_name = v;
+		else
+			argstr = argstr .. " " .. v;
+		end
+	end
+	return kernel_name, argstr;
+end
+
+-- Globals
+function boot(...)
+	local argv = {...};
+	local cmd_name = "";
+	cmd_name, argv = core.popFrontTable(argv);
+	local kernel, argstr = parse_boot_args(argv);
+	if (kernel ~= nil) then
+		loader.perform("unload");
+		config.selectkernel(kernel);
+	end
+	core.boot(argstr);
+end
+
 -- Module exports
 -- Commonly appearing constants
 core.KEY_BACKSPACE	= 8;
diff --git a/stand/lua/menu.lua b/stand/lua/menu.lua
index 53c6a19a86e3..35403448b096 100644
--- a/stand/lua/menu.lua
+++ b/stand/lua/menu.lua
@@ -390,7 +390,6 @@ function menu.run(m)
 	if (m == menu.welcome) then
 		screen.defcursor();
 		print("Exiting menu!");
-		config.loadelf();
 		return false;
 	end