[Midnightbsd-cvs] src [9857] U trunk/sys/boot/forth: update color.4th

[laffer1 at midnightbsd.org]

Revision: 9857
          http://svnweb.midnightbsd.org/src/?rev=9857
Author:   laffer1
Date:     2018-05-23 09:01:59 -0400 (Wed, 23 May 2018)
Log Message:
-----------
update color.4th

Modified Paths:
--------------
    trunk/sys/boot/forth/color.4th
    trunk/sys/boot/forth/color.4th.8

Property Changed:
----------------
    trunk/sys/boot/forth/color.4th
    trunk/sys/boot/forth/color.4th.8

Modified: trunk/sys/boot/forth/color.4th
===================================================================
--- trunk/sys/boot/forth/color.4th	2018-05-23 03:02:31 UTC (rev 9856)
+++ trunk/sys/boot/forth/color.4th	2018-05-23 13:01:59 UTC (rev 9857)
@@ -1,4 +1,4 @@
-\ Copyright (c) 2011 Devin Teske <devinteske at hotmail.com>
+\ Copyright (c) 2011-2013 Devin Teske <dteske at FreeBSD.org>
 \ All rights reserved.
 \ 
 \ Redistribution and use in source and binary forms, with or without
@@ -26,23 +26,24 @@
 
 marker task-color.4th
 
-\ This function returns TRUE if the `loader_color' environment variable is set
-\ to YES, yes, or 1. Otherwise, FALSE is returned.
+\ This function returns FALSE if the `loader_color' environment variable is set
+\ to NO, no, or 0. Otherwise, TRUE is returned (unless booting serial).
 \ 
 : loader_color? ( -- N )
 
 	s" loader_color" getenv dup -1 <> if
 
-		2dup s" YES" compare-insensitive 0= if
+		2dup s" NO" compare-insensitive 0= if
 			2drop
-			TRUE exit
+			FALSE exit
 		then
-		2dup s" 1" compare 0= if
+		2dup s" 0" compare 0= if
 			2drop
-			TRUE exit
+			FALSE exit
 		then
 		drop
 	then
+	drop
 
-	drop FALSE exit
+	boot_serial? if FALSE else TRUE then
 ;


Property changes on: trunk/sys/boot/forth/color.4th
___________________________________________________________________
Added: mnbsd:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/boot/forth/color.4th.8
===================================================================
--- trunk/sys/boot/forth/color.4th.8	2018-05-23 03:02:31 UTC (rev 9856)
+++ trunk/sys/boot/forth/color.4th.8	2018-05-23 13:01:59 UTC (rev 9857)
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2011 Devin Teske
+.\" Copyright (c) 2011-2013 Devin Teske
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -24,12 +24,12 @@
 .\"
 .\" $MidnightBSD$
 .\"
-.Dd May 18, 2011
+.Dd August 6, 2013
 .Dt COLOR.4TH 8
 .Os
 .Sh NAME
 .Nm color.4th
-.Nd MidnightBSD color-detection boot module
+.Nd FreeBSD color-detection boot module
 .Sh DESCRIPTION
 The file that goes by the name of
 .Nm
@@ -50,7 +50,7 @@
 .Dl include color.4th
 .Pp
 This line is present in
-.Pa /boot/beastie.4th
+.Pa /boot/loader.4th
 file, so it is not needed (and should not be re-issued) in a normal setup.
 .Pp
 The commands provided by it are:
@@ -57,13 +57,14 @@
 .Pp
 .Bl -tag -width disable-module_module -compact -offset indent
 .It Ic loader_color?
-Returns TRUE if the
+Returns FALSE if the
 .Ic loader_color
 environment variable is set to
-.Dq YES
+.Dq NO
 (case-insensitive) or
-.Dq 1 .
-Otherwise returns FALSE.
+.Dq 0 .
+Otherwise returns TRUE
+.Pq unless booting serial .
 .El
 .Pp
 The environment variables that effect its behavior are:
@@ -70,13 +71,12 @@
 .Bl -tag -width bootfile -offset indent
 .It Va loader_color
 If set to
-.Dq YES
+.Dq NO
 (case-insensitive) or
-.Dq 1 ,
+.Dq 0 ,
 causes
 .Ic loader_color?
-to return TRUE, indicating to many other modules that color should be used
-whenever/wherever possible.
+to return FALSE, indicating to many modules that color should not be used.
 .El
 .Sh FILES
 .Bl -tag -width /boot/loader.4th -compact
@@ -102,7 +102,6 @@
 .Sh SEE ALSO
 .Xr loader.conf 5 ,
 .Xr loader 8 ,
-.Xr beastie.4th 8 ,
 .Xr loader.4th 8
 .Sh HISTORY
 The
@@ -114,4 +113,4 @@
 .Nm
 set of commands was written by
 .An -nosplit
-.An Devin Teske Aq devinteske at hotmail.com .
+.An Devin Teske Aq dteske at FreeBSD.org .


Property changes on: trunk/sys/boot/forth/color.4th.8
___________________________________________________________________
Added: mnbsd:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property