SVN: rc-scripts/branches/upstart_native/rc.d/init.d/random

[jajcus]

Author: jajcus
Date: Mon May 10 09:39:16 2010
New Revision: 11414

Modified:
   rc-scripts/branches/upstart_native/rc.d/init.d/random
Log:
- save whole entropy pool

Modified: rc-scripts/branches/upstart_native/rc.d/init.d/random
==============================================================================
--- rc-scripts/branches/upstart_native/rc.d/init.d/random	(original)
+++ rc-scripts/branches/upstart_native/rc.d/init.d/random	Mon May 10 09:39:16 2010
@@ -14,6 +14,9 @@
 
 random_seed=/var/run/random-seed
 
+poolfile=/proc/sys/kernel/random/poolsize
+[ -r $poolfile ] && bytes="$(cat $poolfile)" || bytes=512
+
 # See how we were called.
 case "$1" in
   start)
@@ -22,14 +25,13 @@
 		show "Initializing random number generator"
 		busy
 		# Carry a random seed from start-up to start-up
-		# Load and then save 512 bytes, which is the size of the entropy pool
 		if [ -f $random_seed ]; then
 			cat $random_seed >/dev/urandom
 		else
 			touch $random_seed
 		fi
 		chmod 600 $random_seed
-		dd if=/dev/urandom of=$random_seed count=1 bs=512 2>/dev/null
+		dd if=/dev/urandom of=$random_seed count=1 bs=$bytes 2>/dev/null
 		touch /var/lock/subsys/random
 		deltext
 		ok
@@ -38,12 +40,11 @@
   stop)
 	if [ -f /var/lock/subsys/random ]; then
 		# Carry a random seed from shut-down to start-up
-		# Save 512 bytes, which is the size of the entropy pool
 		show "Saving random seed"
 		busy
 		touch $random_seed
 		chmod 600 $random_seed
-		dd if=/dev/urandom of=$random_seed count=1 bs=512 2>/dev/null
+		dd if=/dev/urandom of=$random_seed count=1 bs=$bytes 2>/dev/null
 
 		rm -f /var/lock/subsys/random
 		deltext