diff options
author | dteske <dteske@FreeBSD.org> | 2014-03-03 07:31:55 +0000 |
---|---|---|
committer | dteske <dteske@FreeBSD.org> | 2014-03-03 07:31:55 +0000 |
commit | ccce67094aa5e487cc7c97ca7cf7b3e45dd911d8 (patch) | |
tree | 9cbc79cd551e084edbe363ebac804e582657b02a /sys/boot/forth | |
parent | ccfaf68adbb4f44ab9d2d7a4a13b4e43752b1b37 (diff) | |
download | FreeBSD-src-ccce67094aa5e487cc7c97ca7cf7b3e45dd911d8.zip FreeBSD-src-ccce67094aa5e487cc7c97ca7cf7b3e45dd911d8.tar.gz |
MFC r258270:
Add a try-include word (which acts the same as "include") and use it to
conditionally include (but ignore failures) /boot/loader.rc.local and
/boot/menu.rc.local -- to make customizing the menu easier.
Reviewed by: alfred
Discussed on: -hackers
Diffstat (limited to 'sys/boot/forth')
-rw-r--r-- | sys/boot/forth/loader.4th | 9 | ||||
-rw-r--r-- | sys/boot/forth/loader.4th.8 | 9 | ||||
-rw-r--r-- | sys/boot/forth/loader.rc | 1 | ||||
-rw-r--r-- | sys/boot/forth/menu.rc | 4 |
4 files changed, 22 insertions, 1 deletions
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 |