git: 59f99ecf87c6 - stable/12 - loader_lua: consider userboot console as serial
Kyle Evans
kevans at FreeBSD.org
Sun Sep 12 05:42:19 UTC 2021
The branch stable/12 has been updated by kevans:
URL: https://cgit.FreeBSD.org/src/commit/?id=59f99ecf87c6d7446d658aeb70aee0c4c7a9818b
commit 59f99ecf87c6d7446d658aeb70aee0c4c7a9818b
Author: Toomas Soome <tsoome at FreeBSD.org>
AuthorDate: 2021-02-14 08:28:29 +0000
Commit: Kyle Evans <kevans at FreeBSD.org>
CommitDate: 2021-09-12 05:39:12 +0000
loader_lua: consider userboot console as serial
We use ascii box chars with serial console because we do not know
if terminal can draw unixode box chars. Same problem is about userboot
console.
(cherry picked from commit 5d8c062fe3ee7b2d6aed0b46d22f62c7771c0af8)
---
stand/lua/core.lua | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/stand/lua/core.lua b/stand/lua/core.lua
index 7f6b809761c4..3c44caf7b65e 100644
--- a/stand/lua/core.lua
+++ b/stand/lua/core.lua
@@ -349,7 +349,10 @@ end
function core.isSerialConsole()
local c = loader.getenv("console")
if c ~= nil then
- if c:find("comconsole") ~= nil then
+ -- serial console is comconsole, but also userboot.
+ -- userboot is there, because we have no way to know
+ -- if the user terminal can draw unicode box chars or not.
+ if c:find("comconsole") ~= nil or c:find("userboot") ~= nil then
return true
end
end
More information about the dev-commits-src-all
mailing list