From 59ad463b6cb30b2828ca1c035845c8b43c8a3e1b Mon Sep 17 00:00:00 2001
From: sheldonh <sheldonh@FreeBSD.org>
Date: Mon, 17 Jul 2000 13:39:48 +0000
Subject: Improve on previous commit:

Don't inhibit the trailing newline for entropy-related messages.
Try harder to save the seed file on shutdown.

Reviewed by:	markm
---
 etc/rc          |  4 ++--
 etc/rc.shutdown | 11 +++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'etc')

diff --git a/etc/rc b/etc/rc
index 47d15b4..7b5b5f8 100644
--- a/etc/rc
+++ b/etc/rc
@@ -138,8 +138,8 @@ case ${entropy_file} in
 [Nn][Oo] | '')
 	;;
 *)
-	if [ -f ${entropy_file} -a -r ${entropy_file} ] ; then
-		echo -n "Reading entropy file"
+	if [ -f ${entropy_file} -a -r ${entropy_file} ]; then
+		echo "Reading entropy file"
 		cat ${entropy_file} > /dev/random
 		rm -f ${entropy_file}
 	fi
diff --git a/etc/rc.shutdown b/etc/rc.shutdown
index 7014c70..4abeda0 100644
--- a/etc/rc.shutdown
+++ b/etc/rc.shutdown
@@ -32,12 +32,11 @@ case ${entropy_file} in
 [Nn][Oo] | '')
 	;;
 *)
-	if [ -f ${entropy_file} -a -r ${entropy_file} ] ; then
-		echo -n "Writing entropy file"
-		touch ${entropy_file} && \
-			chmod 600 ${entropy_file} && \
-			dd if=/dev/random of=${entropy_file} bs=4096 count=1
-	fi
+	echo "Writing entropy file"
+	rm -f ${entropy_file}
+	touch ${entropy_file} && \
+		chmod 600 ${entropy_file} && \
+		dd if=/dev/random of=${entropy_file} bs=4096 count=1
 	;;
 esac
 
-- 
cgit v1.1