From 6a9974a4d96b8c9280f5f818243cf91f27b52416 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Mon, 15 Nov 2010 19:55:19 +0000
Subject: [PATCH] Don't display option 2 (to toggle ACPI on or off) on x86
 machines if the BIOS does not support ACPI.  The other options in the menu
 retain their existing numbers, option 2 is simply blanked out (and '2' is
 ignored).

MFC after:	1 month
---
 sys/boot/forth/beastie.4th | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/sys/boot/forth/beastie.4th b/sys/boot/forth/beastie.4th
index 79b818d69aa9..65d5fc03cf3f 100644
--- a/sys/boot/forth/beastie.4th
+++ b/sys/boot/forth/beastie.4th
@@ -140,12 +140,16 @@ at-xy ."         `--{__________) "
 	fbsdbw-logo
 ;
 
-: acpienabled? ( -- flag )
+: acpipresent? ( -- flag )
 	s" hint.acpi.0.rsdp" getenv
 	dup -1 = if
 		drop false exit
 	then
 	2drop
+	true
+;
+
+: acpienabled? ( -- flag )
 	s" hint.acpi.0.disabled" getenv
 	dup -1 <> if
 		s" 0" compare 0<> if
@@ -180,11 +184,18 @@ at-xy ."         `--{__________) "
 	printmenuitem ."  Boot FreeBSD [default]" bootkey !
 	s" arch-i386" environment? if
 		drop
-		printmenuitem ."  Boot FreeBSD with ACPI " bootacpikey !
-		acpienabled? if
-			." disabled"
+		acpipresent? if
+			printmenuitem ."  Boot FreeBSD with ACPI " bootacpikey !
+			acpienabled? if
+				." disabled"
+			else
+				." enabled"
+			then
 		else
-			." enabled"
+			menuidx @
+			1+ dup
+			menuidx !
+			-2 bootacpikey !
 		then
 	else
 		-2 bootacpikey !