diff options
| author | dteske <dteske@FreeBSD.org> | 2014-03-03 07:24:50 +0000 |
|---|---|---|
| committer | dteske <dteske@FreeBSD.org> | 2014-03-03 07:24:50 +0000 |
| commit | 514ba4551bb5415feae7fbc17c1d9f4c6a0abedd (patch) | |
| tree | c5f3c03a4acdf66ac979808f68ba04b1b572b56c /sys/boot | |
| parent | c6179218038fdc57a0de59ddf481672a3ce48e1f (diff) | |
| download | FreeBSD-src-514ba4551bb5415feae7fbc17c1d9f4c6a0abedd.zip FreeBSD-src-514ba4551bb5415feae7fbc17c1d9f4c6a0abedd.tar.gz | |
MFC r257821:
Extend loader_delay as-documented in beastie.4th(8) and delay.4th(8),
making it available to architectures that do not use or load the beastie
menu. This is reported to save headaches on some PPC systems where unload
followed by load does not produce the desired results wherein if-given
the opportunity to abort the initial loading sequence, you can customize
the first load.
Reviewed by: nwhitehorn, kan
Discussed on: -current
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/forth/beastie.4th | 2 | ||||
| -rw-r--r-- | sys/boot/forth/loader.4th | 14 | ||||
| -rw-r--r-- | sys/boot/forth/loader.conf | 2 |
3 files changed, 14 insertions, 4 deletions
diff --git a/sys/boot/forth/beastie.4th b/sys/boot/forth/beastie.4th index b824f2a..4a107af 100644 --- a/sys/boot/forth/beastie.4th +++ b/sys/boot/forth/beastie.4th @@ -28,8 +28,6 @@ marker task-beastie.4th -include /boot/delay.4th - only forth definitions also support-functions variable logoX diff --git a/sys/boot/forth/loader.4th b/sys/boot/forth/loader.4th index ffc52a7..22d9125 100644 --- a/sys/boot/forth/loader.4th +++ b/sys/boot/forth/loader.4th @@ -41,6 +41,7 @@ s" arch-i386" environment? [if] [if] include /boot/support.4th include /boot/color.4th +include /boot/delay.4th only forth also support-functions also builtins definitions @@ -141,8 +142,17 @@ include /boot/check-password.4th \ Will *NOT* try to load kernel and modules if no configuration file \ was succesfully loaded! any_conf_read? if - load_kernel - load_modules + s" loader_delay" getenv -1 = if + load_kernel + load_modules + else + drop + ." Loading Kernel and Modules (Ctrl-C to Abort)" cr + s" also support-functions" evaluate + s" set delay_command='load_kernel load_modules'" evaluate + s" set delay_showdots" evaluate + delay_execute + then then ; diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf index 441f95a..0e56ecc 100644 --- a/sys/boot/forth/loader.conf +++ b/sys/boot/forth/loader.conf @@ -53,6 +53,8 @@ entropy_cache_type="/boot/entropy" ### Loader settings ######################################## ############################################################## +#loader_delay="3" # Delay in seconds before loading anything. + # Default is unset and disabled (no delay). #autoboot_delay="10" # Delay in seconds before autobooting, # set to -1 if you don't want user to be # allowed to interrupt autoboot process and |
