Page MenuHomeFreeBSD
Files F162915900

D11887.id31629.diff
No OneTemporary
Actions

D11887.id31629.diff
View Options

Index: /home/bcr/base/head/sys/boot/common/loader.8
===================================================================
--- /home/bcr/base/head/sys/boot/common/loader.8
+++ /home/bcr/base/head/sys/boot/common/loader.8
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd November 18, 2015
+.Dd August 5, 2017
.Dt LOADER 8
.Os
.Sh NAME
@@ -342,35 +342,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.
Index: sys/boot/forth/loader.conf.5
===================================================================
--- sys/boot/forth/loader.conf.5
+++ sys/boot/forth/loader.conf.5
@@ -23,7 +23,7 @@
.\" SUCH DAMAGE.
.\"
.\" $FreeBSD$
-.Dd January 6, 2016
+.Dd August 5, 2017
.Dt LOADER.CONF 5
.Os
.Sh NAME
@@ -90,6 +90,45 @@
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

File Metadata

Mime Type
text/plain
Expires
Sun, Jul 19, 6:49 AM (18 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35224844
Default Alt Text
D11887.id31629.diff (2 KB)

Event Timeline