commit f7a0afc3de2728299fb2f109618f479a65ec2981
author Daniel Cashman <dcashman@google.com> Fri Mar 25 19:10:28 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 25 19:10:28 2016 +0000
tree 86e6e5ab97f9aa62c7113815899385ece1bd1939
parent f7242b5a0a2438b763090008d62c4f667ae5d3bb
parent 2a1c430ff48514419815ba8575137e8ce7061274

Merge "Revert "Set mmap_rnd_bits to maximum value."" am: bb296fd
am: 2a1c430

* commit '2a1c430ff48514419815ba8575137e8ce7061274':
  Revert "Set mmap_rnd_bits to maximum value."

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index abbb3f1..a87ec3a 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -275,7 +275,8 @@
     # Mount shared so changes propagate into child namespaces
     mount rootfs rootfs / shared rec
     # Mount default storage into root namespace
-    mount none /mnt/runtime/default /storage slave bind rec
+    mount none /mnt/runtime/default /storage bind rec
+    mount none none /storage slave rec
 
     # Make sure /sys/kernel/debug (if present) is labeled properly
     restorecon_recursive /sys/kernel/debug