diff options
| author | Ken Sumrall <ksumrall@android.com> | 2012-04-12 14:38:07 -0700 |
|---|---|---|
| committer | Ken Sumrall <ksumrall@android.com> | 2012-05-01 13:21:19 -0700 |
| commit | 26c2d42a25c1c0d9bbbbfdd86cd4811008c85d25 (patch) | |
| tree | 41bc4cae975c0c3f44735182825a5a4aff74680c | |
| parent | 57ccb5e9d2302fb78a6706e75b896606a8d9166c (diff) | |
| download | wingray-26c2d42a25c1c0d9bbbbfdd86cd4811008c85d25.tar.gz | |
Use the filesystem manager to mount and check filesystems
fs_mgr reads /fstab.<device> to determine what to mount and what to
check, and removes the details from the init.<device>.rc file.
Change-Id: I3106836ab0db1ff7c6a7b3f0d799949ea4ab850d
| -rw-r--r-- | device_base.mk | 1 | ||||
| -rw-r--r-- | fstab.stingray | 11 | ||||
| -rw-r--r-- | init.stingray.rc | 6 |
3 files changed, 13 insertions, 5 deletions
diff --git a/device_base.mk b/device_base.mk index c5aa2f3..a6b5ba3 100644 --- a/device_base.mk +++ b/device_base.mk @@ -32,6 +32,7 @@ include frameworks/native/build/tablet-dalvik-heap.mk PRODUCT_COPY_FILES += \ device/moto/wingray/init.stingray.rc:root/init.stingray.rc \ device/moto/wingray/init.stingray.usb.rc:root/init.stingray.usb.rc \ + device/moto/wingray/fstab.stingray:root/fstab.stingray \ device/moto/wingray/ueventd.stingray.rc:root/ueventd.stingray.rc \ ifneq ($(TARGET_PREBUILT_WIFI_MODULE),) diff --git a/fstab.stingray b/fstab.stingray new file mode 100644 index 0000000..d8b2e55 --- /dev/null +++ b/fstab.stingray @@ -0,0 +1,11 @@ +# Android fstab file. +#<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 + + +/dev/block/platform/sdhci-tegra.3/by-name/system /system ext4 ro wait +/dev/block/platform/sdhci-tegra.3/by-name/pdsb /pds ext4 ro wait +/dev/block/platform/sdhci-tegra.3/by-name/cache /cache ext4 noatime,nosuid,nodev,nomblk_io_submit,errors=panic wait +/dev/block/platform/sdhci-tegra.3/by-name/userdata /data ext4 noatime,nosuid,nodev,nomblk_io_submit,errors=panic wait,encryptable=footer + diff --git a/init.stingray.rc b/init.stingray.rc index ffd346e..dda35e8 100644 --- a/init.stingray.rc +++ b/init.stingray.rc @@ -15,11 +15,7 @@ on early-init mkdir /pds 0777 system system on fs - mount ext4 /dev/block/platform/sdhci-tegra.3/by-name/system /system wait ro - setprop ro.crypto.tmpfs_options size=128m,mode=0771,uid=1000,gid=1000 - mount ext4 /dev/block/platform/sdhci-tegra.3/by-name/userdata /data wait noatime nosuid nodev nomblk_io_submit - mount ext4 /dev/block/platform/sdhci-tegra.3/by-name/cache /cache wait noatime nosuid nodev nomblk_io_submit - mount ext2 /dev/block/platform/sdhci-tegra.3/by-name/pdsb /pds wait ro + mount_all /fstab.stingray setprop ro.crypto.fuse_sdcard true on post-fs-data |