svn commit: r262702 - stable/10/sys/boot/forth

[Devin Teske]

Author: dteske
Date: Mon Mar  3 07:24:50 2014
New Revision: 262702
URL: http://svnweb.freebsd.org/changeset/base/262702

Log:
  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

Modified:
  stable/10/sys/boot/forth/beastie.4th
  stable/10/sys/boot/forth/loader.4th
  stable/10/sys/boot/forth/loader.conf
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/boot/forth/beastie.4th
==============================================================================
--- stable/10/sys/boot/forth/beastie.4th	Mon Mar  3 07:16:39 2014	(r262701)
+++ stable/10/sys/boot/forth/beastie.4th	Mon Mar  3 07:24:50 2014	(r262702)
@@ -28,8 +28,6 @@
 
 marker task-beastie.4th
 
-include /boot/delay.4th
-
 only forth definitions also support-functions
 
 variable logoX

Modified: stable/10/sys/boot/forth/loader.4th
==============================================================================
--- stable/10/sys/boot/forth/loader.4th	Mon Mar  3 07:16:39 2014	(r262701)
+++ stable/10/sys/boot/forth/loader.4th	Mon Mar  3 07:24:50 2014	(r262702)
@@ -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
 ;
 

Modified: stable/10/sys/boot/forth/loader.conf
==============================================================================
--- stable/10/sys/boot/forth/loader.conf	Mon Mar  3 07:16:39 2014	(r262701)
+++ stable/10/sys/boot/forth/loader.conf	Mon Mar  3 07:24:50 2014	(r262702)
@@ -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