Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 27 Apr 2014 22:18:33 +0000 (UTC)
From:      Devin Teske <dteske@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r265028 - head/sys/boot/forth
Message-ID:  <201404272218.s3RMIXj9073052@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dteske
Date: Sun Apr 27 22:18:33 2014
New Revision: 265028
URL: http://svnweb.freebsd.org/changeset/base/265028

Log:
  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

Modified:
  head/sys/boot/forth/beastie.4th
  head/sys/boot/forth/beastie.4th.8
  head/sys/boot/forth/loader.conf.5

Modified: head/sys/boot/forth/beastie.4th
==============================================================================
--- head/sys/boot/forth/beastie.4th	Sun Apr 27 21:17:54 2014	(r265027)
+++ head/sys/boot/forth/beastie.4th	Sun Apr 27 22:18:33 2014	(r265028)
@@ -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

Modified: head/sys/boot/forth/beastie.4th.8
==============================================================================
--- head/sys/boot/forth/beastie.4th.8	Sun Apr 27 21:17:54 2014	(r265027)
+++ head/sys/boot/forth/beastie.4th.8	Sun Apr 27 22:18:33 2014	(r265028)
@@ -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 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.
 .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: head/sys/boot/forth/loader.conf.5
==============================================================================
--- head/sys/boot/forth/loader.conf.5	Sun Apr 27 21:17:54 2014	(r265027)
+++ head/sys/boot/forth/loader.conf.5	Sun Apr 27 22:18:33 2014	(r265028)
@@ -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:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404272218.s3RMIXj9073052>