Date: Tue, 20 Feb 2018 21:37:56 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r329674 - head/stand/lua Message-ID: <201802202137.w1KLbuXw088698@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Tue Feb 20 21:37:55 2018 New Revision: 329674 URL: https://svnweb.freebsd.org/changeset/base/329674 Log: lualoader: Intercept the 'autoboot' cli command Modified: head/stand/lua/core.lua Modified: head/stand/lua/core.lua ============================================================================== --- head/stand/lua/core.lua Tue Feb 20 21:32:36 2018 (r329673) +++ head/stand/lua/core.lua Tue Feb 20 21:37:55 2018 (r329674) @@ -37,23 +37,33 @@ local compose_loader_cmd = function(cmd_name, argstr) return cmd_name; end +-- Internal function -- Parses arguments to boot and returns two values: kernel_name, argstr -- Defaults to nil and "" respectively. -local parse_boot_args = function(argv) +-- This will also parse arguments to autoboot, but the with_kernel argument +-- will need to be explicitly overwritten to false +local parse_boot_args = function(argv, with_kernel) if (#argv == 0) then return nil, ""; end + if (with_kernel == nil) then + with_kernel = true; + end local kernel_name; local argstr = ""; for k, v in ipairs(argv) do - if (v:sub(1,1) ~= "-") then + if (with_kernel) and (v:sub(1,1) ~= "-") then kernel_name = v; else argstr = argstr .. " " .. v; end end - return kernel_name, argstr; + if (with_kernel) then + return kernel_name, argstr; + else + return argstr; + end end -- Globals @@ -67,6 +77,14 @@ function boot(...) config.selectkernel(kernel); end core.boot(argstr); +end + +function autoboot(...) + local argv = {...} + local cmd_name = ""; + cmd_name, argv = core.popFrontTable(argv); + local argstr = parse_boot_args(argv, false); + core.autoboot(argstr); end -- Module exports
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802202137.w1KLbuXw088698>