summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2013-09-18 12:53:11 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-18 12:53:11 -0700
commit5d4be690935ea7970a53837914f31de0a4f0690d (patch)
tree3fb335fdd8b81b771ad79ae8290300b003c280cf
parent02e20daebe72e7bdcd86b04fc061317ae1a2f39d (diff)
parent0e7bd81c938611cfa4ebf44870668300a5bba875 (diff)
downloadsystem_core-5d4be690935ea7970a53837914f31de0a4f0690d.zip
system_core-5d4be690935ea7970a53837914f31de0a4f0690d.tar.gz
system_core-5d4be690935ea7970a53837914f31de0a4f0690d.tar.bz2
am 0e7bd81c: am 4f18183b: Merge "Initialize /dev/urandom earlier in boot." into klp-dev
* commit '0e7bd81c938611cfa4ebf44870668300a5bba875': Initialize /dev/urandom earlier in boot.
-rw-r--r--rootdir/init.rc3
1 files changed, 3 insertions, 0 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 3f6ce6d..794b969 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -181,6 +181,9 @@ on post-fs-data
# We restorecon /data in case the userdata partition has been reset.
restorecon /data
+ # Avoid predictable entropy pool. Carry over entropy from previous boot.
+ copy /data/system/entropy.dat /dev/urandom
+
# Create dump dir and collect dumps.
# Do this before we mount cache so eventually we can use cache for
# storing dumps on platforms which do not have a dedicated dump partition.