Attachment 56393 Details for Bug 85128 – loader.diff

[patch] loader.diff

loader.diff (text/plain; charset=us-ascii), 3.07 KB, created by Daniel Gerzo on 2005-12-30 22:18:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Gerzo

Created: 2005-12-30 22:18:13 UTC

Size: 3.07 KB

patch

obsolete

>diff -ruN loader.orig/loader.8 loader/loader.8
>--- loader.orig/loader.8	Fri Dec 30 21:03:24 2005
>+++ loader/loader.8	Fri Dec 30 21:23:08 2005
>@@ -333,35 +333,8 @@
> Number of seconds
> .Ic autoboot
> will wait before booting.
>-If this variable is not defined,
>-.Ic autoboot
>-will default to 10 seconds.
>-.Pp
>-If set to
>-.Dq Li NO ,
>-no
>-.Ic autoboot
>-will be automatically attempted after processing
>-.Pa /boot/loader.rc ,
>-though explicit
>-.Ic autoboot Ns 's
>-will be processed normally, defaulting to 10 seconds delay.
>-.Pp
>-If set to
>-.Dq Li 0 ,
>-no delay will be inserted, but user still will be able to interrupt
>-.Ic autoboot
>-process and escape into the interactive mode by pressing some key
>-on the console while kernel and
>-modules are being loaded.
>-.Pp
>-If set to
>-.Dq Li -1 ,
>-no delay will be inserted and
>-.Nm
>-will engage interactive mode only if
>-.Ic autoboot
>-has failed for some reason.
>+Configuration options are described in
>+.Xr loader.conf 5 .
> .It Va boot_askname
> Instructs the kernel to prompt the user for the name of the root device
> when the kernel is booted.
>diff -ruN loader.orig/loader.conf loader/loader.conf
>--- loader.orig/loader.conf	Fri Dec 30 21:03:24 2005
>+++ loader/loader.conf	Fri Dec 30 21:15:18 2005
>@@ -41,10 +41,7 @@
> ###  Loader settings  ########################################
> ##############################################################
> 
>-#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
>-				# escape to the loader prompt
>+#autoboot_delay="10"		# Delay in seconds before autobooting
> #beastie_disable="NO"		# Turn the beastie boot menu on and off
> #loader_logo="fbsdbw"		# Desired logo: fbsdbw, beastiebw, beastie, none
> #console="vidconsole"		# A comma separated list of console(s)
>diff -ruN loader.orig/loader.conf.5 loader/loader.conf.5
>--- loader.orig/loader.conf.5	Fri Dec 30 21:03:24 2005
>+++ loader/loader.conf.5	Fri Dec 30 23:10:09 2005
>@@ -90,6 +90,44 @@
> All such settings sharing a common
> prefix refer to the same module.
> .Bl -tag -width Ar
>+.It Ar autoboot_delay
>+Delay in seconds before autobooting.  If set to
>+.Dq Li NO ,
>+no
>+.Ic autoboot
>+will be automatically attempted after processing
>+.Pa /boot/loader.rc ,
>+though explicit
>+.Ic autoboot Ns 's
>+will be processed normally, defaulting to 10 seconds delay.
>+.Pp
>+If set to
>+.Dq Li 0 ,
>+no delay will be inserted, but a user with console access will be able
>+to interrupt the
>+.Ic autoboot
>+process and escape into the interactive mode by pressing some key on
>+the console while kernel and modules are being loaded.
>+.Pp
>+If set to
>+.Dq Li -1 ,
>+no delay will be inserted and
>+.Nm
>+will engage interactive mode only if
>+.Ic autoboot
>+has failed for some reason.
>+In combination with the
>+.Va beastie_disable
>+option, this option prevents users with console access from being able
>+to interrupt the
>+.Ic autoboot
>+process and escape to the loader prompt.
>+To use the
>+.Va autoboot_delay
>+option in this manner,
>+.Va beastie_disable
>+must be set to
>+.Dq Li YES .
> .It Ar exec
> Immediately executes a
> .Xr loader 8

Actions: View | Diff

Attachments on bug 85128: 56393