Update emulator to FUSE-wrap its SD card.
Bug: 11150877
Change-Id: Ie5644beb00391270e4ba3120ff399d667c34e02a
diff --git a/fstab.goldfish b/fstab.goldfish
index ffc95d2..8617307 100644
--- a/fstab.goldfish
+++ b/fstab.goldfish
@@ -5,4 +5,4 @@
/dev/block/mtdblock0 /system ext4 ro,barrier=1 wait
/dev/block/mtdblock1 /data ext4 noatime,nosuid,nodev,barrier=1,nomblk_io_submit wait,check
/dev/block/mtdblock2 /cache ext4 noatime,nosuid,nodev,nomblk_io_submit,errors=panic wait,check
-/devices/platform/goldfish_mmc.0 /storage/sdcard vfat defaults voldmanaged=sdcard:auto
+/devices/platform/goldfish_mmc.0 auto vfat defaults voldmanaged=sdcard:auto
diff --git a/init.goldfish.rc b/init.goldfish.rc
index 93c6b3e..9c08c6e 100644
--- a/init.goldfish.rc
+++ b/init.goldfish.rc
@@ -4,7 +4,8 @@
on init
# See storage config details at http://source.android.com/tech/storage/
- mkdir /storage/sdcard 0555 root root
+ mkdir /mnt/media_rw/sdcard 0700 media_rw media_rw
+ mkdir /storage/sdcard 0700 root root
export EXTERNAL_STORAGE /storage/sdcard
@@ -92,3 +93,8 @@
service goldfish-logcat /system/bin/logcat -Q
oneshot
+
+# fusewrapped external sdcard daemon running as media_rw (1023)
+service fuse_sdcard /system/bin/sdcard -u 1023 -g 1023 -d /mnt/media_rw/sdcard /storage/sdcard
+ class late_start
+ disabled
