misc/70231: Beastie not by default

[Hanspeter Roth]

>Number:         70231
>Category:       misc
>Synopsis:       Beastie not by default
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 09 22:40:27 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Hanspeter Roth
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD goofy.here 5.2-CURRENT FreeBSD 5.2-CURRENT #7: Sat Aug 7 22:01:00 CEST 2004 user at goofy.here:/usr/obj/usr/src/sys/F5 i386


	
>Description:
	The "Beastie" boot-menu makes sense. 
	Just displaying such a beastie make reality ridiculous.
	The Beastie should not be displayed by default.
>How-To-Repeat:
	
>Fix:

This patch displays a banner by default.

diff -ru sys.orig/boot/forth/beastie.4th sys/boot/forth/beastie.4th
--- sys.orig/boot/forth/beastie.4th	Fri Jan  9 20:20:47 2004
+++ sys/boot/forth/beastie.4th	Tue Aug 10 00:01:36 2004
@@ -93,7 +93,34 @@
 	     at-xy ."        `--{__________)"
 ;
 
+: print-banner ( x y -- )
+	2dup at-xy ."  " 1+
+	2dup at-xy ."  " 1+
+	2dup at-xy ."        ______" 1+
+	2dup at-xy ."       / ____/_______  ___" 1+
+	2dup at-xy ."      / /_  / ___/ _ \/ _ \" 1+
+	2dup at-xy ."     / __/ / /  /  __/  __/" 1+
+	2dup at-xy ."    /_/   /_/   \___/\___/" 1+
+	2dup at-xy ."  " 1+
+	2dup at-xy ."                ____ _____ ____" 1+
+	2dup at-xy ."               / __ ) ___// __ \" 1+
+	2dup at-xy ."              / __  \__ \/ / / /" 1+
+	2dup at-xy ."             / /_/ /__/ / /_/ /" 1+
+	     at-xy ."            /_____/____/_____/"
+	     exit
+;
+
 : print-beastie ( x y -- )
+	s" loader_banner" getenv
+	dup -1 = if
+		drop
+		print-banner
+		exit
+	then
+	s" YES" compare-insensitive 0= if
+		print-banner
+		exit
+	then
 	s" loader_color" getenv
 	dup -1 = if
 		drop
diff -ru sys.orig/boot/forth/loader.conf sys/boot/forth/loader.conf
--- sys.orig/boot/forth/loader.conf	Fri Aug  6 17:06:06 2004
+++ sys/boot/forth/loader.conf	Tue Aug 10 00:05:10 2004
@@ -47,6 +47,7 @@
 
 #autoboot_delay="10"		# Delay in seconds before autobooting
 #beastie_disable="NO"		# Turn the beastie boot menu on and off
+#loader_banner="YES"		# Display banner rather than Beastie
 #console="vidconsole"		# Set the current console
 #currdev="disk1s1a"		# Set the current device
 module_path="/boot/modules"	# Set the module search path


>Release-Note:
>Audit-Trail:
>Unformatted: