Date: Tue, 25 Mar 2014 03:23:06 +0000 (UTC) From: Devin Teske <dteske@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r263702 - stable/9/sys/boot/forth Message-ID: <201403250323.s2P3N6x4053828@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dteske Date: Tue Mar 25 03:23:06 2014 New Revision: 263702 URL: http://svnweb.freebsd.org/changeset/base/263702 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/9/sys/boot/forth/beastie.4th stable/9/sys/boot/forth/loader.4th stable/9/sys/boot/forth/loader.conf Directory Properties: stable/9/ (props changed) stable/9/sys/ (props changed) stable/9/sys/boot/ (props changed) stable/9/sys/boot/forth/ (props changed) Modified: stable/9/sys/boot/forth/beastie.4th ============================================================================== --- stable/9/sys/boot/forth/beastie.4th Tue Mar 25 03:19:03 2014 (r263701) +++ stable/9/sys/boot/forth/beastie.4th Tue Mar 25 03:23:06 2014 (r263702) @@ -28,8 +28,6 @@ marker task-beastie.4th -include /boot/delay.4th - only forth definitions also support-functions variable logoX Modified: stable/9/sys/boot/forth/loader.4th ============================================================================== --- stable/9/sys/boot/forth/loader.4th Tue Mar 25 03:19:03 2014 (r263701) +++ stable/9/sys/boot/forth/loader.4th Tue Mar 25 03:23:06 2014 (r263702) @@ -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/9/sys/boot/forth/loader.conf ============================================================================== --- stable/9/sys/boot/forth/loader.conf Tue Mar 25 03:19:03 2014 (r263701) +++ stable/9/sys/boot/forth/loader.conf Tue Mar 25 03:23:06 2014 (r263702) @@ -42,6 +42,8 @@ bitmap_type="splash_image_data" # and pl ### 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403250323.s2P3N6x4053828>