From 93c54dc9b6caac29c0cb5439fc8c7355ed111ead Mon Sep 17 00:00:00 2001
From: Pavel Kirpichyov <pavel.kirpichyov@gmail.com>
Date: Wed, 13 Nov 2013 11:02:50 +0400
Subject: [PATCH] Fix sdcard mounting

Change-Id: I340c66636a5b85222b0e5bed7e476b5c4ba07625
---
 rootdir/fstab.smdk4210   |  6 +++---
 rootdir/init.smdk4210.rc | 31 ++++++++++++++++++++++++-------
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/rootdir/fstab.smdk4210 b/rootdir/fstab.smdk4210
index e3fd2e4..4f15fdb 100755
--- a/rootdir/fstab.smdk4210
+++ b/rootdir/fstab.smdk4210
@@ -11,9 +11,9 @@
 /dev/block/mmcblk0p12                       /preload                ext4      noatime,nosuid,nodev,journal_async_commit                 wait
 
 # vold-managed volumes ("block device" is actually a sysfs devpath)
-/devices/platform/dw_mmc/mmc_host/mmc0/mmc0 /storage/sdcard0        auto      defaults      voldmanaged=sdcard0:11,nonremovable
-/devices/platform/s3c-sdhci.2/mmc_host/mmc1 /storage/sdcard1        auto      defaults      voldmanaged=sdcard1:auto
-/devices/platform/s3c_otghcd/usb            /storage/usbdisk0       auto      defaults      voldmanaged=usbdisk0:auto
+/devices/platform/dw_mmc/mmc_host/mmc0/mmc0     auto    auto    defaults        voldmanaged=sdcard0:11,nonremovable,noemulatedsd
+/devices/platform/s3c-sdhci.2/mmc_host/mmc1     auto    auto    defaults        voldmanaged=sdcard1:auto
+/devices/platform/s3c_otghcd/usb                auto    auto    defaults        voldmanaged=usbdisk0:auto
 
 # recovery
 /dev/block/mmcblk0p5                        /boot                   emmc      defaults      recoveryonly
diff --git a/rootdir/init.smdk4210.rc b/rootdir/init.smdk4210.rc
index 741bc54..0a5ef4e 100644
--- a/rootdir/init.smdk4210.rc
+++ b/rootdir/init.smdk4210.rc
@@ -4,10 +4,15 @@ import init.gps.rc
 on init
     export EXTERNAL_STORAGE /storage/sdcard0
     export SECONDARY_STORAGE /storage/sdcard1
-    mkdir /storage 0775 system system
-    mkdir /storage/sdcard0 0775 system system
-    mkdir /storage/sdcard1 0775 system system
-    mkdir /storage/usbdisk0 0775 system system
+
+    mkdir /mnt/media_rw/sdcard0 0700 media_rw media_rw
+    mkdir /mnt/media_rw/sdcard1 0700 media_rw media_rw
+    mkdir /mnt/media_rw/usbdisk0 0700 media_rw media_rw
+
+    mkdir /storage/sdcard0 0770 root root
+    mkdir /storage/sdcard1 0770 root root
+    mkdir /storage/usbdisk0 0770 root root
+
     mkdir /efs 0771 radio system
     mkdir /preload 0771 system system
     mkdir /mnt 0775 root system
@@ -395,9 +400,9 @@ service iprenew_p2p /system/bin/dhcpcd -n
     oneshot
 
 service iprenew_bnep0 /system/bin/dhcpcd -n
-	class main
-	disabled
-	oneshot
+    class main
+    disabled
+    oneshot
 
 # bluetooth mac address
 service bdaddr /system/bin/bdaddr_read
@@ -412,3 +417,15 @@ service bugreport /system/bin/bugmailer.sh -v
     disabled
     oneshot
     keycodes 114 115 116
+
+service fuse_sdcard0 /system/bin/sdcard -u 1023 -g 1023 -d /mnt/media_rw/sdcard0 /storage/sdcard0
+    class late_start
+    disabled
+
+service fuse_sdcard1 /system/bin/sdcard -u 1023 -g 1023 -d /mnt/media_rw/sdcard1 /storage/sdcard1
+    class late_start
+    disabled
+
+service fuse_usbdisk0 /system/bin/sdcard -u 1023 -g 1023 -d /mnt/media_rw/usbdisk0 /storage/usbdisk0
+    class late_start
+    disabled