svn commit: r294446 - stable/10/sys/boot/forth

[Ed Maste]

Author: emaste
Date: Wed Jan 20 16:59:37 2016
New Revision: 294446
URL: https://svnweb.freebsd.org/changeset/base/294446

Log:
  MFC r293234: Enable the beastie menu for the UEFI console
  
  As of r294445 [in stable/10] the UEFI console includes basic terminal
  emulator support.
  
  Relnotes:	Yes

Modified:
  stable/10/sys/boot/forth/beastie.4th
  stable/10/sys/boot/forth/beastie.4th.8
  stable/10/sys/boot/forth/loader.conf.5
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/boot/forth/beastie.4th
==============================================================================
--- stable/10/sys/boot/forth/beastie.4th	Wed Jan 20 16:53:38 2016	(r294445)
+++ stable/10/sys/boot/forth/beastie.4th	Wed Jan 20 16:59:37 2016	(r294446)
@@ -85,11 +85,6 @@ variable logoY
 also support-functions
 
 : 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
 			any_conf_read? if

Modified: stable/10/sys/boot/forth/beastie.4th.8
==============================================================================
--- stable/10/sys/boot/forth/beastie.4th.8	Wed Jan 20 16:53:38 2016	(r294445)
+++ stable/10/sys/boot/forth/beastie.4th.8	Wed Jan 20 16:59:37 2016	(r294446)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 27, 2014
+.Dd January 20, 2016
 .Dt BEASTIE.4TH 8
 .Os
 .Sh NAME
@@ -119,8 +119,7 @@ Sets the desired row position of the log
 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.
+The beastie boot menu is always skipped if 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

Modified: stable/10/sys/boot/forth/loader.conf.5
==============================================================================
--- stable/10/sys/boot/forth/loader.conf.5	Wed Jan 20 16:53:38 2016	(r294445)
+++ stable/10/sys/boot/forth/loader.conf.5	Wed Jan 20 16:59:37 2016	(r294446)
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
-.Dd April 27, 2014
+.Dd January 20, 2016
 .Dt LOADER.CONF 5
 .Os
 .Sh NAME
@@ -236,8 +236,7 @@ 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.
+The beastie boot menu is always skipped if running non-x86 hardware.
 .It Va loader_logo Pq Dq Li orbbw
 Selects a desired logo in the beastie boot menu.
 Possible values are: