summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2013-07-15 13:28:44 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-07-15 13:28:44 -0700
commit8ff1e5f1e3e24baf311e6263b48f389c206f14ac (patch)
tree8b81c65b73b56c00cfb5f581f20ac9cc470ebc6d
parentff3a362fb9aca15285a95cad6baa08e961330e8e (diff)
parent8f9288eaf10b50d19038f5c7024616e147c64735 (diff)
downloadandroid_device_generic_goldfish-8ff1e5f1e3e24baf311e6263b48f389c206f14ac.tar.gz
android_device_generic_goldfish-8ff1e5f1e3e24baf311e6263b48f389c206f14ac.tar.bz2
android_device_generic_goldfish-8ff1e5f1e3e24baf311e6263b48f389c206f14ac.zip
am 8f9288ea: goldfish: use fstab.goldfish
* commit '8f9288eaf10b50d19038f5c7024616e147c64735': goldfish: use fstab.goldfish
-rw-r--r--fstab.goldfish7
-rw-r--r--init.goldfish.rc3
2 files changed, 8 insertions, 2 deletions
diff --git a/fstab.goldfish b/fstab.goldfish
index 7bfef7a..ffc95d2 100644
--- a/fstab.goldfish
+++ b/fstab.goldfish
@@ -1,5 +1,8 @@
# Android fstab file.
-#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
+#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
# The filesystem that contains the filesystem checker binary (typically /system) cannot
# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
-/devices/platform/goldfish_mmc.0 /storage/sdcard vfat defaults voldmanaged=sdcard:auto
+/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
diff --git a/init.goldfish.rc b/init.goldfish.rc
index 84c4b15..c850ba2 100644
--- a/init.goldfish.rc
+++ b/init.goldfish.rc
@@ -59,6 +59,9 @@ on boot
# supported, and arbitrary breakage may result if you specify
# something else.
+on fs
+ mount_all /fstab.goldfish
+
service goldfish-setup /system/etc/init.goldfish.sh
user root
group root