From owner-svn-src-all@freebsd.org Tue Feb 20 19:21:35 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EF43BF232BC; Tue, 20 Feb 2018 19:21:34 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A579D680FC; Tue, 20 Feb 2018 19:21:34 +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 A073E5EB7; Tue, 20 Feb 2018 19:21:34 +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 w1KJLYc9015271; Tue, 20 Feb 2018 19:21:34 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1KJLYV6015269; Tue, 20 Feb 2018 19:21:34 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201802201921.w1KJLYV6015269@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Tue, 20 Feb 2018 19:21:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r329654 - head/stand/lua X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/stand/lua X-SVN-Commit-Revision: 329654 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Feb 2018 19:21:35 -0000 Author: kevans Date: Tue Feb 20 19:21:34 2018 New Revision: 329654 URL: https://svnweb.freebsd.org/changeset/base/329654 Log: lualoader: Ignore ACPI bits on !i386 Modified: head/stand/lua/core.lua head/stand/lua/menu.lua Modified: head/stand/lua/core.lua ============================================================================== --- head/stand/lua/core.lua Tue Feb 20 18:45:38 2018 (r329653) +++ head/stand/lua/core.lua Tue Feb 20 19:21:34 2018 (r329654) @@ -218,6 +218,10 @@ function core.isSerialBoot() return false; end +function core.isSystem386() + return (loader.machine_arch == "i386"); +end + -- This may be a better candidate for a 'utility' module. function core.shallowCopyTable(tbl) local new_tbl = {}; @@ -235,7 +239,7 @@ end -- generally be set upon execution of the kernel. Because of this, we can't (or -- don't really want to) detect/disable ACPI on !i386 reliably. Just set it -- enabled if we detect it and leave well enough alone if we don't. -if (core.getACPIPresent(false)) then +if (core.isSystem386()) and (core.getACPIPresent(false)) then core.setACPI(true); end return core; Modified: head/stand/lua/menu.lua ============================================================================== --- head/stand/lua/menu.lua Tue Feb 20 18:45:38 2018 (r329653) +++ head/stand/lua/menu.lua Tue Feb 20 19:21:34 2018 (r329654) @@ -128,6 +128,7 @@ menu.boot_options = { -- acpi { entry_type = core.MENU_ENTRY, + visible = core.isSystem386, name = function() return OnOff(color.highlight("A") .. "CPI :", core.acpi);