From: John Marino <draco@marino.st>
Date: Sat, 29 Nov 2014 12:07:39 +0000 (+0100)
Subject: dloader: Add a new option for color loader, "fred_is_blue"
X-Git-Tag: v4.2.0rc~1372
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/a147fd464491168ef2f39894468da7ffb523e959

dloader: Add a new option for color loader, "fred_is_blue"

When loader_color="YES", the dragonfly logo will show Fred as a red
dragonfly with red wings.  If fred_is_blue="YES" is set in loader.conf
as well, then a blue version of Fred will show instead (slightly more
fancy as wings are two-tone).

While here, update the man page with this new option and document
"fred_separated" option which was added yesterday.
---

diff --git a/share/man/man5/loader.conf.5 b/share/man/man5/loader.conf.5
index 5a6fd32fc2..af887b7d72 100644
--- a/share/man/man5/loader.conf.5
+++ b/share/man/man5/loader.conf.5
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/sys/boot/forth/loader.conf.5,v 1.18 2002/08/27 01:02:56 trhodes Exp $
-.Dd October 6, 2010
+.Dd November 29, 2014
 .Dt LOADER.CONF 5
 .Os
 .Sh NAME
@@ -217,6 +217,8 @@ then install the bootcode to the partition via
 .Pp
 Note that in comconsole mode the kernel will pick up the baud rate
 from the boot loader, so no kernel recompile is needed.
+.It Va kernel
+.Pq Dq kernel .
 .It Va fred_disable
 .Pq Dq NO
 Shows a monochrome version of Fred, the official
@@ -230,8 +232,9 @@ to
 .It Va fred_on_left
 .Pq Dq NO
 Shows Fred on the left side of the menu rather than the right side.
-.It Va kernel
-.Pq Dq kernel .
+.It Va fred_separated
+.Pq Dq NO
+Draws a line between Fred and the menu block.
 .It Va loader_color
 .Pq Dq NO
 If set to
@@ -244,6 +247,10 @@ boot menu appears (remember to set
 to
 .Dq NO
 for this to work.)
+.It Va fred_is blue
+.Pq Dq NO
+When a color loader is requested, Fred is depicted as a red dragonfly
+with red wings.  This setting causes Fred to be shown as a blue dragonfly.
 .It Va splash_bmp_load
 .Pq Dq NO
 If set to
diff --git a/sys/boot/dloader/cmds.c b/sys/boot/dloader/cmds.c
index 995ecb74b0..be30a85b8b 100644
--- a/sys/boot/dloader/cmds.c
+++ b/sys/boot/dloader/cmds.c
@@ -473,6 +473,24 @@ static char *logo_color[LOGO_LINES] = {
 	"               `,'               ",
 	"                                 " };
 
+static char *logo_indigo[LOGO_LINES] = {
+	" ,--,                       ,--, ",
+	" |   `-,       _:_       ,-'   | ",
+	"  `,    `-,   (/ \\)   ,-'    ,'  ",
+	"    `-,    `-,/   \\,-'    ,-'    ",
+	"       `------{   }------'       ",
+	"   ,----------{   }----------,   ",
+	"  |        _,-{   }-,_        |  ",
+	"   `-,__,-'   \\   /   `-,__,-'   ",
+	"               | |               ",
+	"               | |               ",
+	"               | |               ",
+	"               | |               ",
+	"               | |               ",
+	"               | |               ",
+	"               `,'               ",
+	"                                 " };
+
 static char *logo_mono[LOGO_LINES] =  {
 	" ,--,                       ,--, ",
 	" |   `-,       _:_       ,-'   | ",
@@ -527,6 +545,9 @@ menu_display(void)
 	if (dvar_istrue(dvar_get("fred_on_left")))
 		logo_left = 1;
 
+	if (dvar_istrue(dvar_get("fred_is_blue")))
+		logo = logo_indigo;
+
 	if (dvar_istrue(dvar_get("fred_separated")))
 		separated = 1;
 
diff --git a/sys/boot/dloader/loader.conf b/sys/boot/dloader/loader.conf
index 95fc18f916..ec44041aed 100644
--- a/sys/boot/dloader/loader.conf
+++ b/sys/boot/dloader/loader.conf
@@ -43,7 +43,8 @@ bitmap_type="splash_image_data" # and place it on the module_path
 #fred_disable="NO"		# Turn Fred's boot menu on and off
 #fred_separated="NO"		# Place line between Fred and menu
 #fred_on_left="NO"		# Show Fred on left side of menu
-#loader_color="NO"		# Set to YES for a color version of Fred
+#loader_color="NO"		# Set to YES for a red color version of Fred
+#fred_is_blue="NO"		# When colored, show Fred in blue hue instead
 #console="vidconsole"		# Set the current console
 #currdev="disk1s1a"		# Set the current device
 #module_path=";modules"		# Set the module search path