git: b3e822993503 - releng/13.0 - loader_lua: consider userboot console as serial
Toomas Soome
tsoome at FreeBSD.org
Wed Feb 24 18:38:58 UTC 2021
The branch releng/13.0 has been updated by tsoome:
URL: https://cgit.FreeBSD.org/src/commit/?id=b3e822993503a9f18575c71020cb98056e022164
commit b3e822993503a9f18575c71020cb98056e022164
Author: Toomas Soome <tsoome at FreeBSD.org>
AuthorDate: 2021-02-14 08:28:29 +0000
Commit: Toomas Soome <tsoome at FreeBSD.org>
CommitDate: 2021-02-23 07:39:18 +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)
Approved by: re (gjb)
---
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 a119c3c258f8..55c26e0d6d39 100644
--- a/stand/lua/core.lua
+++ b/stand/lua/core.lua
@@ -403,7 +403,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