From owner-svn-src-releng@freebsd.org Sat May 9 04:00:58 2020 Return-Path: Delivered-To: svn-src-releng@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D4B822DBB0C; Sat, 9 May 2020 04:00:58 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49Jtlt5Mwjz4CQ1; Sat, 9 May 2020 04:00:58 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B2648DE02; Sat, 9 May 2020 04:00:58 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04940wg9099374; Sat, 9 May 2020 04:00:58 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04940wg1099373; Sat, 9 May 2020 04:00:58 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202005090400.04940wg1099373@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Sat, 9 May 2020 04:00:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r360834 - releng/11.4/stand/lua X-SVN-Group: releng X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: releng/11.4/stand/lua X-SVN-Commit-Revision: 360834 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.32 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 May 2020 04:00:58 -0000 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