svn commit: r340040 - head/stand/lua

[Kyle Evans]

Author: kevans
Date: Fri Nov  2 03:25:23 2018
New Revision: 340040
URL: https://svnweb.freebsd.org/changeset/base/340040

Log:
  lualoader: Implement boot-conf
  
  MFC after:	3 days

Modified:
  head/stand/lua/cli.lua
  head/stand/lua/cli.lua.8

Modified: head/stand/lua/cli.lua
==============================================================================
--- head/stand/lua/cli.lua	Thu Nov  1 23:56:10 2018	(r340039)
+++ head/stand/lua/cli.lua	Fri Nov  2 03:25:23 2018	(r340040)
@@ -115,6 +115,16 @@ function cli.autoboot(...)
 	core.autoboot(argstr)
 end
 
+cli['boot-conf'] = function(...)
+	local _, argv = cli.arguments(...)
+	local kernel, argstr = parseBootArgs(argv)
+	if kernel ~= nil then
+		loader.perform("unload")
+		config.selectKernel(kernel)
+	end
+	core.autoboot(argstr)
+end
+
 -- Used for splitting cli varargs into cmd_name and the rest of argv
 function cli.arguments(...)
 	local argv = {...}

Modified: head/stand/lua/cli.lua.8
==============================================================================
--- head/stand/lua/cli.lua.8	Thu Nov  1 23:56:10 2018	(r340039)
+++ head/stand/lua/cli.lua.8	Fri Nov  2 03:25:23 2018	(r340040)
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 9, 2018
+.Dd October 31, 2018
 .Dt CLI.LUA 8
 .Os
 .Sh NAME
@@ -80,10 +80,11 @@ Arguments may be passed to it as usual, space-delimite
 As of present, the
 .Nm
 module by default provides commands for
-.Ic autoboot
+.Ic autoboot ,
+.Ic boot ,
 and
-.Ic boot .
-In both cases, the
+.Ic boot-conf.
+In all three cases, the
 .Xr core.lua 8
 module will load all ELF modules as-needed before executing the equivalent
 built-in loader commands.