aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle Evans <kevans@FreeBSD.org>2020-05-09 04:00:58 +0000
committerKyle Evans <kevans@FreeBSD.org>2020-05-09 04:00:58 +0000
commitcb6ff3f4fcd6bd920474b4098fd49f9b90d81236 (patch)
tree9a846d159cf1f54ff5656628fe3faeb67e40a223
parenta64666ea8780f6a50e74b81a96de5035ff02b767 (diff)
downloadsrc-cb6ff3f4fcd6bd920474b4098fd49f9b90d81236.tar.gz
src-cb6ff3f4fcd6bd920474b4098fd49f9b90d81236.zip
MFS r360795: lualoader: fix loader.lua mis-merge
This mis-merge came from r360599; r331321 introduced core.isUEFIBoot but will not get merged back to stable/11 due to being somewhat disruptive. I had resolved the conflict once, but had to re-do the merge locally due to another conflict and failed to resolve it the second time. This mistake is explosive to those trying to run lualoader on stable/11, but is mitigated by the fact that lualoader is not the default here. PR: 246291 Approved by: re (gjb)
Notes
Notes: svn path=/releng/11.4/; revision=360834
-rw-r--r--stand/lua/loader.lua3
1 files changed, 0 insertions, 3 deletions
diff --git a/stand/lua/loader.lua b/stand/lua/loader.lua
index 0008cae93641..21fa9c994a43 100644
--- a/stand/lua/loader.lua
+++ b/stand/lua/loader.lua
@@ -41,9 +41,6 @@ local password = require("password")
config.load()
-if core.isUEFIBoot() then
- loader.perform("efi-autoresizecons")
-end
-- Our console may have been setup with different settings before we get
-- here, so make sure we reset everything back to default.
if color.isEnabled() then