>Number: 188807
>Category: misc
>Synopsis: TESTING Updates based on work performed today.
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Apr 19 22:00:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: devinteske
>Release: master
>Organization:
github
>Environment:
System: FreeBSD freefall.freebsd.org 11.0-CURRENT FreeBSD 11.0-CURRENT #0
r264289: Wed Apr 9 02:48:19 UTC 2014
[email protected]:/usr/obj/usr/src/sys/FREEFALL amd64
X-pull-request: 1
>Description:
This is what I came up with based on testing and refinement from a little bit
of research I performed. Hope you like it.
>How-To-Repeat:
>Fix:
diff --git a/sys/boot/forth/beastie.4th b/sys/boot/forth/beastie.4th
index 4a107af..7a2cbb09 100644
--- a/sys/boot/forth/beastie.4th
+++ b/sys/boot/forth/beastie.4th
@@ -202,56 +202,26 @@ variable logoY
drop
then
- s" loader_logo" getenv dup -1 = if
- logoX @ logoY @
- loader_color? if
- orb-logo
- else
- orbbw-logo
- then
- drop exit
- then
-
- 2dup s" beastie" compare-insensitive 0= if
- logoX @ logoY @ beastie-logo
- 2drop exit
- then
- 2dup s" beastiebw" compare-insensitive 0= if
- logoX @ logoY @ beastiebw-logo
- 2drop exit
- then
- 2dup s" fbsdbw" compare-insensitive 0= if
- logoX @ logoY @ fbsdbw-logo
- 2drop exit
- then
- 2dup s" orb" compare-insensitive 0= if
- logoX @ logoY @ orb-logo
- 2drop exit
- then
- 2dup s" orbbw" compare-insensitive 0= if
- logoX @ logoY @ orbbw-logo
- 2drop exit
- then
- 2dup s" tribute" compare-insensitive 0= if
- logoX @ logoY @
- s" tribute-logo" sfind if
- execute
- else
- drop orb-logo
- then
- 2drop exit
+ s" loader_logo" getenv dup -1 <> if
+ dup 5 + allocate if ENOMEM throw then
+ 0 2swap strcat s" -logo" strcat
+ over -rot ( a-addr/u -- a-addr a-addr/u )
+ sfind ( a-addr a-addr/u -- a-addr xt bool )
+ rot ( a-addr xt bool -- xt bool a-addr )
+ free ( xt bool a-addr -- xt bool ior )
+ if EFREE throw then
+ else
+ 0 ( cruft -- cruft bool ) \ load the default below
then
- 2dup s" tributebw" compare-insensitive 0= if
- logoX @ logoY @
- s" tributebw-logo" sfind if
- execute
+ 0= if
+ drop ( cruft -- )
+ loader_color? if
+ ['] orb-logo
else
- drop orbbw-logo
+ ['] orbbw-logo
then
- 2drop exit
then
-
- 2drop
+ logoX @ logoY @ rot execute
;
: clear-beastie ( -- ) \ clears beastie from the screen
diff --git a/sys/boot/forth/loader.4th b/sys/boot/forth/loader.4th
index 22d9125..55778ff 100644
--- a/sys/boot/forth/loader.4th
+++ b/sys/boot/forth/loader.4th
@@ -233,7 +233,16 @@ include /boot/check-password.4th
s" disable-module" s" disable loading of a module" .?
s" toggle-module" s" toggle loading of a module" .?
s" show-module" s" show module load data" .?
+ s" try-include" s" try to load/interpret files" .?
;
+: try-include ( -- ) \ see loader.4th(8)
+ ['] include ( -- xt ) \ get the execution token of `include'
+ catch ( xt -- exception# | 0 ) if \ failed
+ LF parse ( c -- s-addr/u ) 2drop \ advance >in to EOL (drop data)
+ \ ... prevents words unused by `include' from being interpreted
+ then
+; immediate \ interpret immediately for access to `source' (aka tib)
+
only forth also
diff --git a/sys/boot/forth/loader.4th.8 b/sys/boot/forth/loader.4th.8
index 02f9641..b689077 100644
--- a/sys/boot/forth/loader.4th.8
+++ b/sys/boot/forth/loader.4th.8
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd October 17, 2013
+.Dd November 13, 2013
.Dt LOADER.4TH 8
.Os
.Sh NAME
@@ -158,6 +158,13 @@ files to specify the action after a module loading fails.
Used inside
.Xr loader.conf 5
files to specify the action after a module loading fails.
+.It Ic try-include Ar file Op Ar
+Process script files if they exist.
+Each file, in turn, is completely read into memory,
+and then each of its lines is passed to the command line interpreter.
+If any error is returned by the interpreter, the try-include
+command aborts immediately, without reading any other files, and
+silently returns without error.
.El
.Sh FILES
.Bl -tag -width /boot/loader.4th -compact
diff --git a/sys/boot/forth/loader.rc b/sys/boot/forth/loader.rc
index a84753d..b4a6d51 100644
--- a/sys/boot/forth/loader.rc
+++ b/sys/boot/forth/loader.rc
@@ -3,6 +3,7 @@
\
\ Includes additional commands
include /boot/loader.4th
+try-include /boot/loader.rc.local
\ Reads and processes loader.conf variables
\ NOTE: Change to `initialize' if you enable the below boot menu
diff --git a/sys/boot/forth/menu.rc b/sys/boot/forth/menu.rc
index 3d8bff9..e49f567 100644
--- a/sys/boot/forth/menu.rc
+++ b/sys/boot/forth/menu.rc
@@ -120,6 +120,10 @@ set optionstoggled_ansi[6]="[1mV[37merbose.....
[32;7mOn[0;37m"
\
set menu_timeout_command="boot"
+\ Include optional elements defined in a local file
+\
+try-include /boot/menu.rc.local
+
\ Display the main menu (see `menu.4th')
set menuset_initial=1
menuset-loadinitial
diff --git a/sys/boot/i386/loader/loader.rc b/sys/boot/i386/loader/loader.rc
index cb2f723..287c05e 100644
--- a/sys/boot/i386/loader/loader.rc
+++ b/sys/boot/i386/loader/loader.rc
@@ -3,6 +3,7 @@
\
\ Includes additional commands
include /boot/loader.4th
+try-include /boot/loader.rc.local
\ Reads and processes loader.conf variables
initialize
>Release-Note:
>Audit-Trail:
>Unformatted:
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "[email protected]"
