From: John Marino Date: Sun, 29 Mar 2015 00:15:07 +0000 (+0100) Subject: loader: set color option (blue) by default X-Git-Tag: v4.2.0rc~433 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/72b78560f664235e0eb1be2fb5d750bd0baff568 loader: set color option (blue) by default On the loader screen, the blue version of Fred will now be shown by default unless the serial console is selected ("comconsole" value for "console" option in boot/loader.conf). As part of the work: * "loader_color" option removed * "loader_plain" is a new option, to force Fred in monochrome * "fred_is_blue" option (4.1 only) removed * "fred_is_red" is a new option as the red scheme is now alternate Users that had "loader_color" set on before will see Fred change color to blue, thus they will need to set "fred_is_red=true" in /boot/loader.conf to restore the loader as it was before. Users that don't like color will have to explicitly set "loader_plain=true" to get rid of it. This is a cosmetic change which hopefully makes DragonFly a tiny bit more attractive to first time users. --- diff --git a/UPDATING b/UPDATING index d75d8ecb07..779df588c6 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,31 @@ + UPGRADING DRAGONFLY FROM 4.0 TO LATER VERSIONS + +-----------------------------------------------------------------------+ +LOADER OPTIONS CHANGED +---------------------- + +Right after the development branch started, the Fred art accompanying the +loader menu was improved. The line between Fred and the menu was removed +by default (but can optionally be returned) and the placement shifted as +a result. The drawing was improved, and the colored version was improved, +changing the eyes and wing color from white to red. A new color version +of Fred was added, one with a blue scheme. + +The loader menu defaults have changed since release 4.0: The vertical +line was removed, the loader is displayed in color by default*, and the +blue scheme is used. + +The loader.conf changes are: +loader_color: option has been removed +loader_plain: option has been added, it changed menu to monochrome +fred_is_red: changes color scheme from blue to red +fred_is_blue: option existed only on 4.1, it has been removed +fred_separated: Adds line between Fred and menu (as seen previously) + +* If loader.conf defines "console" as "comconsole" or "console" is defined + in the environment as "comconsole" then color will not be displayed, + even if loader_plain value is "NO". + SENDMAIL REMOVED FROM BASE -------------------------- diff --git a/share/man/man5/loader.conf.5 b/share/man/man5/loader.conf.5 index af887b7d72..3659e0b863 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 November 29, 2014 +.Dd March 28, 2015 .Dt LOADER.CONF 5 .Os .Sh NAME @@ -219,38 +219,40 @@ 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 +.It Va loader_plain .Pq Dq NO -Shows a monochrome version of Fred, the official +Unlike in the past, the loader defaults to displaying Fred, the official .Dx -mascot, when the -boot menu appears. -To make his life a bit more colorful, consider setting -.Pa loader_color -to -.Dq YES . -.It Va fred_on_left +mascot, in color when the boot menu appears, unless +.Pa console +is set to +.Dq comconsole +in +.Pa loader.conf +or in the environment. If set to +.Dq YES , +Fred will always be displayed in monochrome. +.It Va fred_is_red .Pq Dq NO -Shows Fred on the left side of the menu rather than the right side. -.It Va fred_separated +Under color mode, Fred is depicted as a blue dragonfly with cyan wings +by default. If set to +.Dq YES , +Fred will be shown as a red dragonfly with red wings instead. +.It Va fred_disable .Pq Dq NO -Draws a line between Fred and the menu block. -.It Va loader_color +Fred is displayed with the menu by default. If set to +.Dq YES , +Fred will not be shown. The area will simply be blank. +.It Va fred_on_left .Pq Dq NO If set to .Dq YES , -you'll meet Fred, the official -.Dx -mascot, in technicolor when the -boot menu appears (remember to set -.Pa fred_disable -to -.Dq NO -for this to work.) -.It Va fred_is blue +Fred will be displayed on the left side of the menu rather than the right side. +.It Va fred_separated .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. +If set to +.Dq YES , +a line will be drawn between Fred and the menu block. .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 be30a85b8b..4edeb568ce 100644 --- a/sys/boot/dloader/cmds.c +++ b/sys/boot/dloader/cmds.c @@ -533,21 +533,25 @@ menu_display(void) dvar_t dvar; int i; int logo_left = 0; /* default to fred on right */ - int separated = 0; /* default no line b/w fred & menu */ - char **logo = logo_mono; + int separated = 0; /* default blue fred without line */ + char **logo = logo_indigo; + char *console_val = getenv("console"); - if (dvar_istrue(dvar_get("loader_color"))) + if (dvar_istrue(dvar_get("fred_is_red"))) logo = logo_color; + if (dvar_istrue(dvar_get("loader_plain"))) + logo = logo_mono; + + if (strcmp(console_val, "comconsole") == 0) + logo = logo_mono; + if (dvar_istrue(dvar_get("fred_disable"))) logo = NULL; 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 397aeff1a4..2bea7ed70e 100644 --- a/sys/boot/dloader/loader.conf +++ b/sys/boot/dloader/loader.conf @@ -43,8 +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 red color version of Fred -#fred_is_blue="NO" # When colored, show Fred in blue hue instead +#loader_plain="NO" # Set to YES to disable menu color +#fred_is_red="NO" # Show Fred in red scheme rather than blue #console="vidconsole" # Set the current console #currdev="disk1s1a" # Set the current device #module_path=";modules" # Set the module search path