After some discussion with markm, back out most of rev 1.221,

which really wasn't such a hot idea in retrospect.

If the random device isn't available, it probably isn't wanted.
If it's wanted, it should be enabled in loader.conf.

1 files changed, 1 insertions, 9 deletions

diff --git a/etc/rc b/etc/rc
index 0f03830..aa373a2 100644
--- a/etc/rc
+++ b/etc/rc
@@ -140,15 +140,7 @@ case ${entropy_file} in
 *)
 	if [ -f ${entropy_file} -a -r ${entropy_file} -a -w /dev/random ]; then
 		echo "Reading entropy file"
-		if ! cat ${entropy_file} 2>/dev/null >/dev/random; then
-			if ! kldstat -n randomdev >/dev/null 2>&1; then
-				kldload randomdev && \
-				    cat ${entropy_file} 2>/dev/null >/dev/random
-			fi
-		fi
-		if [ $? != 0 ]; then
-			echo "Writing entropy file to /dev/random failed"
-		fi
+		cat ${entropy_file} > /dev/random
 		rm -f ${entropy_file}
 	fi
 	;;