Author: kevans Date: Sat May 9 04:00:58 2020 New Revision: 360834 URL: https://svnweb.freebsd.org/changeset/base/360834
Log: 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) Modified: releng/11.4/stand/lua/loader.lua Directory Properties: releng/11.4/ (props changed) Modified: releng/11.4/stand/lua/loader.lua ============================================================================== --- releng/11.4/stand/lua/loader.lua Sat May 9 02:01:29 2020 (r360833) +++ releng/11.4/stand/lua/loader.lua Sat May 9 04:00:58 2020 (r360834) @@ -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 _______________________________________________ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"