Deleted Added
full compact
core.lua (344220) core.lua (352349)
1--
2-- SPDX-License-Identifier: BSD-2-Clause-FreeBSD
3--
4-- Copyright (c) 2015 Pedro Souza <pedrosouza@freebsd.org>
5-- Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
6-- All rights reserved.
7--
8-- Redistribution and use in source and binary forms, with or without

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

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

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

21-- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22-- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23-- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24-- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25-- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26-- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27-- SUCH DAMAGE.
28--
29-- $FreeBSD: stable/11/stand/lua/core.lua 344220 2019-02-17 02:39:17Z kevans $
29-- $FreeBSD: stable/11/stand/lua/core.lua 352349 2019-09-15 02:48:15Z kevans $
30--
31
32local config = require("config")
33local hook = require("hook")
34
35local core = {}
36
37local default_safe_mode = false

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

314 local c = loader.getenv("currdev")
315
316 if c ~= nil then
317 return c:match("^zfs:") ~= nil
318 end
319 return false
320end
321
30--
31
32local config = require("config")
33local hook = require("hook")
34
35local core = {}
36
37local default_safe_mode = false

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

314 local c = loader.getenv("currdev")
315
316 if c ~= nil then
317 return c:match("^zfs:") ~= nil
318 end
319 return false
320end
321
322function core.isSerialConsole()
323 local c = loader.getenv("console")
324 if c ~= nil then
325 if c:find("comconsole") ~= nil then
326 return true
327 end
328 end
329 return false
330end
331
322function core.isSerialBoot()
323 local s = loader.getenv("boot_serial")
324 if s ~= nil then
325 return true
326 end
327
328 local m = loader.getenv("boot_multicons")
329 if m ~= nil then

--- 53 unchanged lines hidden ---
332function core.isSerialBoot()
333 local s = loader.getenv("boot_serial")
334 if s ~= nil then
335 return true
336 end
337
338 local m = loader.getenv("boot_multicons")
339 if m ~= nil then

--- 53 unchanged lines hidden ---