From 15be1e4be08d35bc57dd11d5ba3684ea69c9071c Mon Sep 17 00:00:00 2001
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Tue, 15 Nov 2005 21:26:49 +0000
Subject: [PATCH] Catch up with loader_color -> loader_logo and document
 beastie_disable.

---
 sys/boot/forth/loader.conf   |  2 +-
 sys/boot/forth/loader.conf.5 | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf
index a43f087fb9f..2302123dda0 100644
--- a/sys/boot/forth/loader.conf
+++ b/sys/boot/forth/loader.conf
@@ -35,7 +35,6 @@ vesa_load="NO"			# Set this to YES to load the vesa module
 bitmap_load="NO"		# Set this to YES if you want splash screen!
 bitmap_name="splash.bmp"	# Set this to the name of the bmp or pcx file
 bitmap_type="splash_image_data" # and place it on the module_path
-loader_color="NO"		# Set this to YES to enable splash screen colors
 
 
 ##############################################################
@@ -47,6 +46,7 @@ loader_color="NO"		# Set this to YES to enable splash screen colors
 				# allowed to interrupt autoboot process and
 				# escape to the loader prompt
 #beastie_disable="NO"		# Turn the beastie boot menu on and off
+#loader_logo="fbsdbw"		# Desired logo: fbsdbw, beastiebw, beastie, none
 #comconsole_speed="9600"	# Set the current serial console speed
 #console="vidconsole"		# A comma separated list of console(s)
 #currdev="disk1s1a"		# Set the current device
diff --git a/sys/boot/forth/loader.conf.5 b/sys/boot/forth/loader.conf.5
index 9d113e515d0..f8deb8cac8b 100644
--- a/sys/boot/forth/loader.conf.5
+++ b/sys/boot/forth/loader.conf.5
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
-.Dd August 18, 2005
+.Dd November 15, 2005
 .Dt LOADER.CONF 5
 .Os
 .Sh NAME
@@ -207,11 +207,18 @@ If set to
 .Dq YES ,
 the vesa module will be loaded, enabling bitmaps above VGA resolution to
 be displayed.
-.It Va loader_color
-.Pq Dq NO
+.It Va beastie_disable
 If set to
 .Dq YES ,
-will load the splash screen colors.
+the beastie boot menu will be skipped.
+.It Va loader_logo Pq Dq Li fbsdbw
+Selects a desired logo in the beastie boot menu.
+Possible values are:
+.Dq Li fbsdbw ,
+.Dq Li beastiebw ,
+.Dq Li beastie ,
+and
+.Dq Li none .
 .El
 .Sh FILES
 .Bl -tag -width /boot/defaults/loader.conf -compact
-- 
2.45.2