svn commit: r241361 - head/sys/boot/forth
Devin Teske
dteske at FreeBSD.org
Tue Oct 9 06:29:13 UTC 2012
Author: dteske
Date: Mon Oct 8 23:02:35 2012
New Revision: 241361
URL: http://svn.freebsd.org/changeset/base/241361
Log:
Add an echo to say we're "Booting..." when the overloaded "boot" Ficl word is
executed to better differentiate between loader-specific errors and kernel-
specific errors (if ever any of either).
This type of functionality hasn't been required before the introduction of the
advanced menu system (r222417). Adding this functionality will help different-
iate errors at the loader-level such as a BTX halt caused by heap exhaustion
and errors that may be involved with executing the kernel (wrong architecture
for example). A user can learn that messages before "Booting..." are related to
the loader(8) environment and it's Forth-ilk, while those after are not
related to loader(8) -- the point that loader(8) has ``left the building''.
This patch also includes a man-page update to color.4th(8) as the color logic
moves to a lower-level (from being included by beastie.4th to being included
by loader.4th).
After noticing a delay between execution of the overloaded "boot" FICL word and
the display of text on-screen, gcooper confirmed that the introduction of a
builtin memory test (disabled by adding hw.memtest.tests="0" to loader.conf(5))
was the cause of the delay.
This patch adds an echo to produce "Booting..." when the overloaded "boot" word
is executed (this includes from the interactive command-prompt on all arches,
from the menu system on arches that run the beastie menu, and even those arches
that run the menu but disable it by setting beastie_disable="YES" in
loader.conf(5)). When loader_color="YES" in loader.conf(5), the same message is
produced but in white text on a blue background (only the letters produced have
this background -- opposed to perhaps the entire line).
Modified:
head/sys/boot/forth/beastie.4th
head/sys/boot/forth/color.4th.8
head/sys/boot/forth/loader.4th
Modified: head/sys/boot/forth/beastie.4th
==============================================================================
--- head/sys/boot/forth/beastie.4th Mon Oct 8 23:02:32 2012 (r241360)
+++ head/sys/boot/forth/beastie.4th Mon Oct 8 23:02:35 2012 (r241361)
@@ -28,7 +28,6 @@
marker task-beastie.4th
-include /boot/color.4th
include /boot/delay.4th
variable logoX
Modified: head/sys/boot/forth/color.4th.8
==============================================================================
--- head/sys/boot/forth/color.4th.8 Mon Oct 8 23:02:32 2012 (r241360)
+++ head/sys/boot/forth/color.4th.8 Mon Oct 8 23:02:35 2012 (r241361)
@@ -50,7 +50,7 @@ through the command:
.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:
@@ -102,7 +102,6 @@ loader_color="YES"
.Sh SEE ALSO
.Xr loader.conf 5 ,
.Xr loader 8 ,
-.Xr beastie.4th 8 ,
.Xr loader.4th 8
.Sh HISTORY
The
Modified: head/sys/boot/forth/loader.4th
==============================================================================
--- head/sys/boot/forth/loader.4th Mon Oct 8 23:02:32 2012 (r241360)
+++ head/sys/boot/forth/loader.4th Mon Oct 8 23:02:35 2012 (r241361)
@@ -40,6 +40,7 @@ s" arch-i386" environment? [if] [if]
2048 dictincrease ! \ 2048 additional cells each time
include /boot/support.4th
+include /boot/color.4th
only forth also support-functions also builtins definitions
@@ -64,6 +65,12 @@ only forth also support-functions also b
: boot
0= if ( interpreted ) get_arguments then
+ loader_color? if
+ ." [37;44mBooting...[0m" cr
+ else
+ ." Booting..." cr
+ then
+
\ Unload only if a path was passed
dup if
>r over r> swap
More information about the svn-src-head
mailing list