Deleted Added
full compact
cli.lua (353136) cli.lua (360596)
1--
2-- SPDX-License-Identifier: BSD-2-Clause-FreeBSD
3--
4-- Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
5-- All rights reserved.
6--
7-- Redistribution and use in source and binary forms, with or without
8-- modification, are permitted provided that the following conditions

--- 11 unchanged lines hidden (view full) ---

20-- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21-- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
22-- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23-- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24-- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25-- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26-- SUCH DAMAGE.
27--
1--
2-- SPDX-License-Identifier: BSD-2-Clause-FreeBSD
3--
4-- Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
5-- All rights reserved.
6--
7-- Redistribution and use in source and binary forms, with or without
8-- modification, are permitted provided that the following conditions

--- 11 unchanged lines hidden (view full) ---

20-- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21-- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
22-- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23-- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24-- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25-- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26-- SUCH DAMAGE.
27--
28-- $FreeBSD: stable/11/stand/lua/cli.lua 353136 2019-10-06 04:01:15Z kevans $
28-- $FreeBSD: stable/11/stand/lua/cli.lua 360596 2020-05-03 03:53:38Z kevans $
29--
30
31local config = require("config")
32local core = require("core")
33
34local cli = {}
35
36-- Internal function

--- 84 unchanged lines hidden (view full) ---

121 local kernel, argstr = parseBootArgs(argv)
122 if kernel ~= nil then
123 loader.perform("unload")
124 config.selectKernel(kernel)
125 end
126 core.autoboot(argstr)
127end
128
29--
30
31local config = require("config")
32local core = require("core")
33
34local cli = {}
35
36-- Internal function

--- 84 unchanged lines hidden (view full) ---

121 local kernel, argstr = parseBootArgs(argv)
122 if kernel ~= nil then
123 loader.perform("unload")
124 config.selectKernel(kernel)
125 end
126 core.autoboot(argstr)
127end
128
129cli['read-conf'] = function(...)
130 local _, argv = cli.arguments(...)
131 config.readConf(assert(core.popFrontTable(argv)))
132end
133
129cli['reload-conf'] = function(...)
130 config.reload()
131end
132
133-- Used for splitting cli varargs into cmd_name and the rest of argv
134function cli.arguments(...)
135 local argv = {...}
136 local cmd_name
137 cmd_name, argv = core.popFrontTable(argv)
138 return cmd_name, argv
139end
140
141return cli
134cli['reload-conf'] = function(...)
135 config.reload()
136end
137
138-- Used for splitting cli varargs into cmd_name and the rest of argv
139function cli.arguments(...)
140 local argv = {...}
141 local cmd_name
142 cmd_name, argv = core.popFrontTable(argv)
143 return cmd_name, argv
144end
145
146return cli