Author: dteske
Date: Mon Aug 26 23:37:11 2013
New Revision: 254942
URL: http://svnweb.freebsd.org/changeset/base/254942
Log:
Building upon SVN r254237, disable automated activation of alternate layouts
and add support for default underride to $loader_version, acting as a way to
name a release. Release text is not displayed for the aforementioned feature
of alternate display layout (introduced in r254237); however, for all other
layouts (incl. default), the release name is displayed at lower-right.
See version.4th(8) for additional information and/or historical details.
NOTE: Also a minor edit to version.4th(8) while we're here.
Modified:
head/sys/boot/forth/beastie.4th
head/sys/boot/forth/version.4th
head/sys/boot/forth/version.4th.8
Modified: head/sys/boot/forth/beastie.4th
==============================================================================
--- head/sys/boot/forth/beastie.4th Mon Aug 26 22:29:42 2013
(r254941)
+++ head/sys/boot/forth/beastie.4th Mon Aug 26 23:37:11 2013
(r254942)
@@ -205,21 +205,9 @@ variable logoY
s" loader_logo" getenv dup -1 = if
logoX @ logoY @
loader_color? if
- s" tribute-logo"
- sfind if
- execute
- else
- drop
- orb-logo
- then
+ orb-logo
else
- s" tributebw-logo"
- sfind if
- execute
- else
- drop
- orbbw-logo
- then
+ orbbw-logo
then
drop exit
then
@@ -249,7 +237,7 @@ variable logoY
s" tribute-logo" sfind if
execute
else
- orb-logo
+ drop orb-logo
then
2drop exit
then
@@ -258,7 +246,7 @@ variable logoY
s" tributebw-logo" sfind if
execute
else
- orbbw-logo
+ drop orbbw-logo
then
2drop exit
then
Modified: head/sys/boot/forth/version.4th
==============================================================================
--- head/sys/boot/forth/version.4th Mon Aug 26 22:29:42 2013
(r254941)
+++ head/sys/boot/forth/version.4th Mon Aug 26 23:37:11 2013
(r254942)
@@ -29,6 +29,9 @@ marker task-version.4th
variable versionX
variable versionY
+\ Default $loader_version value if not overridden or using tribute screen
+: str_loader_version ( -- C-ADDR/U|-1 ) -1 ;
+
\ Initialize text placement to defaults
80 versionX ! \ NOTE: this is the ending column (text is right-justified)
24 versionY !
@@ -43,9 +46,33 @@ variable versionY
?number drop versionY ! -1
then drop
- \ Exit if a version was not set
+ \ Default version if none was set
s" loader_version" getenv dup -1 = if
- drop exit
+ drop
+ \ Default version if no logo is requested
+ s" loader_logo" getenv dup -1 = if
+ drop str_loader_version
+ else
+ 2dup s" tribute" compare-insensitive 0= if
+ 2drop
+ s" tribute-logo" sfind if
+ drop exit \ see beastie tribute-text
+ else
+ drop str_loader_version
+ then
+ else 2dup s" tributebw" compare-insensitive 0= if
+ 2drop
+ s" tributebw-logo" sfind if
+ drop exit \ see beastie tribute-text
+ else
+ drop str_loader_version
+ then
+ else
+ 2drop str_loader_version
+ then then
+ then
+ then dup -1 = if
+ drop exit \ default version (above) is disabled
then
\ Right justify the text
Modified: head/sys/boot/forth/version.4th.8
==============================================================================
--- head/sys/boot/forth/version.4th.8 Mon Aug 26 22:29:42 2013
(r254941)
+++ head/sys/boot/forth/version.4th.8 Mon Aug 26 23:37:11 2013
(r254942)
@@ -91,7 +91,7 @@ causes the version to be printed without
.Pq default is ANSI Cyan .
.El
.Sh FILES
-.Bl -tag -width /boot/loader.4th -compact
+.Bl -tag -width /boot/version.4th -compact
.It Pa /boot/loader
The
.Xr loader 8 .
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
