commit fa2888730d1e7edd133e46e8ebf1ff17328ea3b3
author Kees Cook <keescook@google.com> Thu Mar 24 02:57:45 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 24 02:57:45 2016 +0000
tree 0d59c09efba7a88f69ea441115b583250870b67c
parent 9c8583bc063e31b370db449ee72f3424cb99c6f4
parent a0218d9c09993afc4151f25fb40b678e8533c8b2

Merge "init: improve mmap ASLR failure reporting" am: b27026f
am: a0218d9

* commit 'a0218d9c09993afc4151f25fb40b678e8533c8b2':
  init: improve mmap ASLR failure reporting

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