Move the process of storing entropy from /dev/random and reseeding with

it at boot time closer to the way we want it to be in the final version.

* Move the default directory to /var/db/entropy
* Run the entropy saving cron job every 11 minutes. This seems
  to be a better default, although still bikeshed material.
* Feed /dev/random some cheesy "entropy" from various commands
  and files before the disks are mounted. This gives /dev/random
  a better chance of running without blocking early.
* Move the reseeding with previously stored entropy to the point
  immediately after the disks are mounted.
* Make the harvesting script a little safer in regards to the
  possibility of accidentally overwriting something other
  than a regular file.

2 files changed, 4 insertions, 4 deletions

diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
index 0fc9833f2040..e6e9a4d64c3a 100644
--- a/etc/mtree/BSD.root.dist
+++ b/etc/mtree/BSD.root.dist
@@ -5,10 +5,6 @@
 
 /set type=dir uname=root gname=wheel mode=0755
 .
-/set type=dir uname=operator gname=operator mode=0700
-    .entropy
-    ..
-/set type=dir uname=root gname=wheel mode=0755
     bin
     ..
     boot
diff --git a/etc/mtree/BSD.var.dist b/etc/mtree/BSD.var.dist
index 78bfd857f63c..053a0f5ac05b 100644
--- a/etc/mtree/BSD.var.dist
+++ b/etc/mtree/BSD.var.dist
@@ -24,6 +24,10 @@
         ..
     ..
     db              mode=0755
+/set type=dir uname=operator gname=operator mode=0700
+    entropy
+    ..
+/set type=dir uname=root gname=wheel
         pkg         mode=0755
         ..
     ..