Disable the beastie menu for EFI console which doesn't support ANSI codes

(so things like `at-xy', `clear', and other commands don't work making it
impossible to generate a living menu).

Reviewed by:	nwhitehorn, emaste

3 files changed, 11 insertions, 2 deletions

diff --git a/sys/boot/forth/beastie.4th b/sys/boot/forth/beastie.4th
index 7a2cbb0..2fc073d 100644
--- a/sys/boot/forth/beastie.4th
+++ b/sys/boot/forth/beastie.4th
@@ -242,6 +242,11 @@ variable logoY
 ;
 
 : beastie-start ( -- ) \ starts the menu
+	s" console" getenv dup -1 <> if
+		s" efi" 2swap contains? if
+			s" set beastie_disable=YES" evaluate
+		then
+	else drop then
 	s" beastie_disable" getenv
 	dup -1 <> if
 		s" YES" compare-insensitive 0= if
diff --git a/sys/boot/forth/beastie.4th.8 b/sys/boot/forth/beastie.4th.8
index 30d29b2..534a60c 100644
--- a/sys/boot/forth/beastie.4th.8
+++ b/sys/boot/forth/beastie.4th.8
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 16, 2011
+.Dd April 27, 2014
 .Dt BEASTIE.4TH 8
 .Os
 .Sh NAME
@@ -119,6 +119,8 @@ Sets the desired row position of the logo. Default is 4.
 If set to
 .Dq YES ,
 the beastie boot menu will be skipped.
+The beastie boot menu is always skipped if booting UEFI or running non-x86
+hardware.
 .It Va loader_delay
 If set to a number higher than zero, introduces a delay before starting the
 beastie boot menu. During the delay the user can press either Ctrl-C to skip
diff --git a/sys/boot/forth/loader.conf.5 b/sys/boot/forth/loader.conf.5
index d638909..3c1ce1d 100644
--- a/sys/boot/forth/loader.conf.5
+++ b/sys/boot/forth/loader.conf.5
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
-.Dd October 18, 2013
+.Dd April 27, 2014
 .Dt LOADER.CONF 5
 .Os
 .Sh NAME
@@ -236,6 +236,8 @@ be displayed.
 If set to
 .Dq YES ,
 the beastie boot menu will be skipped.
+The beastie boot menu is always skipped if booting UEFI or running non-x86
+hardware.
 .It Va loader_logo Pq Dq Li orbbw
 Selects a desired logo in the beastie boot menu.
 Possible values are: