commit f848a429dde741742988e2365d257058d57acbf8
author Kenny Root <kroot@google.com> Thu Jul 15 14:01:01 2010 -0700
committer Kenny Root <kroot@google.com> Thu Jul 15 14:01:01 2010 -0700
tree 8ff9c2fe68de7e797a6ec694f75b8e7fcf87ab77
parent f4f7697f69a68abc755d9c4d1ef384984d81b164
parent 3cac9cb3991d85616536e82e8ded0af4ba034ef6

resolved conflicts for merge of 3cac9cb3 to master

Change-Id: I86b5173ad49522eae082bf2a3d096dbfb5240129

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index f18b264..fdc36c8 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -18,6 +18,7 @@
     export ANDROID_ASSETS /system/app
     export ANDROID_DATA /data
     export ASEC_MOUNTPOINT /mnt/asec
+    export LOOP_MOUNTPOINT /mnt/obb
     export BOOTCLASSPATH /system/framework/core.jar:/system/framework/bouncycastle.jar:/system/framework/ext.jar:/system/framework/framework.jar:/system/framework/android.policy.jar:/system/framework/services.jar:/system/framework/core-junit.jar
 
 # Backward compatibility
@@ -49,6 +50,10 @@
     mkdir /mnt/asec  0700 root system
     mount tmpfs tmpfs /mnt/asec mode=0755,gid=1000
 
+    # Filesystem image public mount points.
+    mkdir /mnt/obb 0700 root system
+    mount tmpfs tmpfs /mnt/obb mode=0755,gid=1000
+
     mount rootfs rootfs / ro remount
 
     write /proc/sys/kernel/panic_on_oops 1