View | Details | Raw Unified | Return to bug 265001 | Differences between
and this patch

Collapse All | Expand All

(-)b/stand/lua/config.lua (-1 / +1 lines)
Lines 63-69 local MSG_FAILSYN_EOLVAR = "Unescaped $ at end of line" Link Here
63
local MSG_FAILSYN_BADVAR = "Malformed variable expression at position '%d'"
63
local MSG_FAILSYN_BADVAR = "Malformed variable expression at position '%d'"
64
64
65
local MODULEEXPR = '([-%w_]+)'
65
local MODULEEXPR = '([-%w_]+)'
66
local QVALEXPR = '"(.*)"'
66
local QVALEXPR = '"([^"]*)"'
67
local QVALREPL = QVALEXPR:gsub('%%', '%%%%')
67
local QVALREPL = QVALEXPR:gsub('%%', '%%%%')
68
local WORDEXPR = "([-%w%d][-%w%d_.]*)"
68
local WORDEXPR = "([-%w%d][-%w%d_.]*)"
69
local WORDREPL = WORDEXPR:gsub('%%', '%%%%')
69
local WORDREPL = WORDEXPR:gsub('%%', '%%%%')
(-)b/stand/lua/menu.lua (+3 lines)
Lines 58-63 local function bootenvSet(env) Link Here
58
	loader.setenv("vfs.root.mountfrom", env)
58
	loader.setenv("vfs.root.mountfrom", env)
59
	loader.setenv("currdev", env .. ":")
59
	loader.setenv("currdev", env .. ":")
60
	config.reload()
60
	config.reload()
61
	if loader.getenv("kernelname") ~= nil then
62
		loader.perform("unload")
63
	end
61
end
64
end
62
65
63
-- Module exports
66
-- Module exports
(-)b/stand/lua/password.lua (+1 lines)
Lines 135-140 function password.check() Link Here
135
	local pwd = loader.getenv("password")
135
	local pwd = loader.getenv("password")
136
	if pwd ~= nil then
136
	if pwd ~= nil then
137
		core.autoboot()
137
		core.autoboot()
138
		loader.setenv("autoboot_delay", "NO")
138
		-- The autoboot sequence was interrupted, so we'll need to
139
		-- The autoboot sequence was interrupted, so we'll need to
139
		-- prompt for a password.  Put the screen back into a known
140
		-- prompt for a password.  Put the screen back into a known
140
		-- good state, otherwise we're drawing back a couple lines
141
		-- good state, otherwise we're drawing back a couple lines

Return to bug 265001