svn commit: r329654 - head/stand/lua

[Kyle Evans]

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);