commit fba81a42ede1df6e687e29a9254402a3033cca36
author Zimuzo Ezeozue <zezeozue@google.com> Mon Sep 23 16:02:19 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 23 16:02:19 2019 +0000
tree 8334b82dc91543e3767fabc48dfd082e16bb66d6
parent 187764212c51ef73f3da229614857d5809ea9e63
parent 919f0115dfc6fc1fd2436f5deb6e52ee21dae249

Merge "Prepare pass_through mounts"

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index d5fed5a..0fa6efc 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -154,6 +154,14 @@
     mkdir /mnt/user/0/self 0755 root root
     mkdir /mnt/user/0/emulated 0755 root root
     mkdir /mnt/user/0/emulated/0 0755 root root
+
+    # Prepare directories for pass through processes
+    mkdir /mnt/pass_through 0755 root root
+    mkdir /mnt/pass_through/0 0755 root root
+    mkdir /mnt/pass_through/0/self 0755 root root
+    mkdir /mnt/pass_through/0/emulated 0755 root root
+    mkdir /mnt/pass_through/0/emulated/0 0755 root root
+
     mkdir /mnt/expand 0771 system system
     mkdir /mnt/appfuse 0711 root root
 
@@ -678,6 +686,8 @@
   # Mount default storage into root namespace
   mount none /mnt/user/0 /storage bind rec
   mount none none /storage slave rec
+  # Bootstrap the emulated volume for the pass_through directory for user 0
+  mount none /data/media /mnt/pass_through/0/emulated bind rec
 on zygote-start && property:persist.sys.fuse=false
   # Mount default storage into root namespace
   mount none /mnt/runtime/default /storage bind rec