summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2013-10-09 17:22:19 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-09 17:22:19 -0700
commit828bd482a1aeacf96d5f3a3e0701029d9f890c5f (patch)
tree12ca789c04f10a8087dde5b8bd3d3da273e49734
parent0b8bbf4218f6cc26167275c8f5f57f67a9037f36 (diff)
parent2524d39681566f4eca7afb7950e05ab642978263 (diff)
downloadandroid_device_generic_goldfish-828bd482a1aeacf96d5f3a3e0701029d9f890c5f.tar.gz
android_device_generic_goldfish-828bd482a1aeacf96d5f3a3e0701029d9f890c5f.tar.bz2
android_device_generic_goldfish-828bd482a1aeacf96d5f3a3e0701029d9f890c5f.zip
am 2524d396: Update emulator to FUSE-wrap its SD card.
* commit '2524d39681566f4eca7afb7950e05ab642978263': Update emulator to FUSE-wrap its SD card.
-rw-r--r--fstab.goldfish2
-rw-r--r--init.goldfish.rc8
2 files changed, 8 insertions, 2 deletions
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 early-init
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 qemud /system/bin/qemud
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