summaryrefslogtreecommitdiffstats
path: root/sys/boot/forth
diff options
context:
space:
mode:
authormarkm <markm@FreeBSD.org>2015-06-30 17:09:41 +0000
committermarkm <markm@FreeBSD.org>2015-06-30 17:09:41 +0000
commit8b5b408c2c62fe7ff51161d7e59c3d1798f71834 (patch)
treed01a430c798b97b0fca9bf7cb575552298f86fda /sys/boot/forth
parentd5861655770012f2a69a575c40f59a3567351672 (diff)
downloadFreeBSD-src-8b5b408c2c62fe7ff51161d7e59c3d1798f71834.zip
FreeBSD-src-8b5b408c2c62fe7ff51161d7e59c3d1798f71834.tar.gz
Updated random(4) boot/shutdown scripting.
Fix the man pages as well. Differential Revision: https://reviews.freebsd.org/D2924 Approved by: so (delphij)
Diffstat (limited to 'sys/boot/forth')
-rw-r--r--sys/boot/forth/loader.conf13
-rw-r--r--sys/boot/forth/loader.conf.514
2 files changed, 23 insertions, 4 deletions
diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf
index 240e403..a844889 100644
--- a/sys/boot/forth/loader.conf
+++ b/sys/boot/forth/loader.conf
@@ -42,11 +42,16 @@ bitmap_type="splash_image_data" # and place it on the module_path
### Random number generator configuration ###################
##############################################################
-entropy_cache_load="NO" # Set this to YES to load entropy at boot time
+# See rc.conf(5). The entropy_boot_file config variable must agree with the
+# settings below.
+
+entropy_cache_load="YES" # Set this to NO to disable loading
+ # entropy at boot time
entropy_cache_name="/boot/entropy" # Set this to the name of the file
-entropy_cache_type="/boot/entropy"
-#kern.random.sys.seeded="0" # Set this to 1 to start /dev/random
- # without waiting for a (re)seed.
+entropy_cache_type="/boot/entropy" # Required for the kernel to find
+ # the boot-time entropy cache. This
+ # must not change value even if the
+ # _name above does change!
##############################################################
### RAM Blacklist configuration #############################
diff --git a/sys/boot/forth/loader.conf.5 b/sys/boot/forth/loader.conf.5
index 3c1ce1d..37f10bf 100644
--- a/sys/boot/forth/loader.conf.5
+++ b/sys/boot/forth/loader.conf.5
@@ -252,6 +252,19 @@ and
If set to
.Dq NO ,
the beastie boot menu will be displayed without ANSI coloring.
+.It Va entropy_cache_load
+.Pq Dq YES
+If set to
+.Dq NO ,
+the very early
+boot-time entropy file
+will not be loaded.
+See the entropy entries in
+.Xr rc.conf 5 .
+.It Va entropy_cache_name
+.Pq Dq /boot/entropy
+The name of the very early
+boot-time entropy cache file.
.El
.Sh FILES
.Bl -tag -width /boot/defaults/loader.conf -compact
@@ -269,6 +282,7 @@ contains the instructions to automatically process
.Nm .
.El
.Sh SEE ALSO
+.Xr rc.conf 5 ,
.Xr boot 8 ,
.Xr loader 8 ,
.Xr loader.4th 8
OpenPOWER on IntegriCloud