1 files changed, 33 insertions, 18 deletions
diff --git a/rootdir/factory_init.rc b/rootdir/factory_init.rc
index 912a134..a1715d1 100644
--- a/rootdir/factory_init.rc
+++ b/rootdir/factory_init.rc
@@ -1,7 +1,5 @@
 import /init.environ.rc
 import init.ssd.rc
-import init.no_ssd.rc
-import init.ssd_nomuser.rc
 import init.fon.rc
 import init.trustonic.rc
 
@@ -22,8 +20,6 @@ on early-init
     start ueventd
 
     write /proc/bootprof "INIT: usr/eng build setting"
-# create mountpoints
-    mkdir /mnt 0775 root system
 
 on init
 
@@ -46,6 +42,10 @@ loglevel 5
     symlink /dev/block/platform/mtk-msdc.0/by-name/nvram /dev/nvram   
     symlink /dev/block/platform/mtk-msdc.0/by-name/para /dev/misc
     symlink /dev/block/platform/mtk-msdc.0/by-name/logo /dev/logo 
+    #create mountpoint for persist partition
+    mkdir /persist 0771 system system
+#Create nvdata mount point
+    mkdir /nvdata 0771 system system
 
 
 # Link /vendor to /system/vendor for devices without a vendor partition.
@@ -56,28 +56,43 @@ loglevel 5
     mount cgroup none /acct cpuacct
     mkdir /acct/uid
 
-# Backwards Compat - XXX: Going away in G*
-    symlink /mnt/sdcard /sdcard
-
     mkdir /system
     mkdir /data 0771 system system
     mkdir /cache 0770 system cache
     mkdir /config 0500 root root
     mkdir /protect_f 0771 system system
     mkdir /protect_s 0771 system system
-    #create mountpoint for persist partition
-    mkdir /persist 0771 system system
-#Create nvdata mount point
-    mkdir /nvdata 0771 system system
 
+# Mount staging areas for devices managed by vold
     # See storage config details at http://source.android.com/tech/storage/
-    mkdir /mnt/shell 0700 shell shell
-    mkdir /mnt/media_rw 0700 media_rw media_rw
-    mkdir /storage 0751 root sdcard_r
-
-    # Filesystem image public mount points.
-    mkdir /mnt/obb 0700 root system
-    mount tmpfs tmpfs /mnt/obb mode=0755,gid=1000
+    mkdir /mnt 0755 root system
+    mount tmpfs tmpfs /mnt mode=0755,uid=0,gid=1000
+    restorecon_recursive /mnt
+    # Support legacy paths
+    symlink /sdcard /mnt/sdcard
+
+    mkdir /mnt/secure 0700 root root
+    mkdir /mnt/secure/asec 0700 root root
+    mkdir /mnt/asec 0755 root system
+    mkdir /mnt/obb 0755 root system
+    mkdir /mnt/media_rw 0750 root media_rw
+    mkdir /mnt/user 0755 root root
+    mkdir /mnt/user/0 0755 root root
+    mkdir /mnt/expand 0771 system system
+
+    # Storage views to support runtime permissions
+    mkdir /storage 0755 root root
+    mkdir /mnt/runtime 0700 root root
+    mkdir /mnt/runtime/default 0755 root root
+    mkdir /mnt/runtime/default/self 0755 root root
+    mkdir /mnt/runtime/read 0755 root root
+    mkdir /mnt/runtime/read/self 0755 root root
+    mkdir /mnt/runtime/write 0755 root root
+    mkdir /mnt/runtime/write/self 0755 root root
+
+    # Symlink to keep legacy apps working in multi-user world
+    symlink /storage/self/primary /sdcard
+    symlink /mnt/user/0/primary /mnt/runtime/default/self/primary
 
     write /proc/sys/kernel/panic_on_oops 1
     write /proc/sys/kernel/hung_task_timeout_secs 0