summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Hackmann <ghackmann@google.com>2014-06-11 15:57:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-11 15:57:10 +0000
commit3b0bfe135d9ce7fae0de32432583ee8cd27d1184 (patch)
treed5eedf0651a6d7396e3908f203c935eae2ff42fc
parentcdd78a386dff8438a66d40abb4fa9c639c57b89c (diff)
parentd8a6e67044ddcac7c53adbe6b871c33447110905 (diff)
downloadandroid_device_generic_goldfish-3b0bfe135d9ce7fae0de32432583ee8cd27d1184.tar.gz
android_device_generic_goldfish-3b0bfe135d9ce7fae0de32432583ee8cd27d1184.tar.bz2
android_device_generic_goldfish-3b0bfe135d9ce7fae0de32432583ee8cd27d1184.zip
am d8a6e670: Merge "Revert "goldfish: cache image is not ext4. yet.""
* commit 'd8a6e67044ddcac7c53adbe6b871c33447110905': Revert "goldfish: cache image is not ext4. yet."
-rw-r--r--fstab.goldfish3
1 files changed, 1 insertions, 2 deletions
diff --git a/fstab.goldfish b/fstab.goldfish
index be83a16..8617307 100644
--- a/fstab.goldfish
+++ b/fstab.goldfish
@@ -4,6 +4,5 @@
# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
/dev/block/mtdblock0 /system ext4 ro,barrier=1 wait
/dev/block/mtdblock1 /data ext4 noatime,nosuid,nodev,barrier=1,nomblk_io_submit wait,check
-# 2014-03-13: Yes. yaffs2. The emulator tools need some updating to support ext4 for the cache image.
-/dev/block/mtdblock2 /cache yaffs2 noatime,nosuid,nodev wait,check
+/dev/block/mtdblock2 /cache ext4 noatime,nosuid,nodev,nomblk_io_submit,errors=panic wait,check
/devices/platform/goldfish_mmc.0 auto vfat defaults voldmanaged=sdcard:auto