Date: Thu, 7 May 2020 19:38:39 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r360795 - stable/11/stand/lua Message-ID: <202005071938.047Jcdfx032272@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Thu May 7 19:38:39 2020 New Revision: 360795 URL: https://svnweb.freebsd.org/changeset/base/360795 Log: 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 Modified: stable/11/stand/lua/loader.lua Modified: stable/11/stand/lua/loader.lua ============================================================================== --- stable/11/stand/lua/loader.lua Thu May 7 19:32:49 2020 (r360794) +++ stable/11/stand/lua/loader.lua Thu May 7 19:38:39 2020 (r360795) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005071938.047Jcdfx032272>