diff options
| author | Tao Bao <tbao@google.com> | 2017-03-22 06:51:23 -0700 |
|---|---|---|
| committer | Tao Bao <tbao@google.com> | 2017-03-22 07:07:43 -0700 |
| commit | d037710937d1c15c2d5c70f06f752799e77eaf60 (patch) | |
| tree | 91b8a8bb6a5281188bfc868d756640653eacfc69 /fstab.common | |
| parent | c2750e5529388dc4a7354a5ff8aee8e5fb1d2e45 (diff) | |
Revert "Move fstab files to /vendor/etc/."
This reverts commit 03f297713036576a60f7a3cbc96e3f7b8bc0f677.
recovery fails to find /misc while it tries to load from /fstab.sailfish.
Bug: 35811655
Bug: 36502022
Test: boot into recovery on sailfish. No "failed to find /misc partition"
message.
Change-Id: I6552411e601372ce3cfb11f6c9dff9fcf6ead384
Diffstat (limited to 'fstab.common')
| -rwxr-xr-x | fstab.common | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/fstab.common b/fstab.common index 0c1111fa..803f1de5 100755 --- a/fstab.common +++ b/fstab.common @@ -1,14 +1,16 @@ # Android fstab file. -# The filesystem that contains the filesystem e2fsck binary (typically /system) cannot -# specify 'check', and must come before any filesystems that do specify 'check' +# 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 -# NOTE: /vendor partition is now early-mounted and the fstab entry is specified in device tree: -# /proc/device-tree/firmware/android/fstab/vendor - -#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags> -/dev/block/platform/soc/624000.ufshc/by-name/system / ext4 ro,barrier=1 wait,slotselect,verify -/dev/block/platform/soc/624000.ufshc/by-name/modem /firmware/radio vfat ro,shortname=lower,uid=1000,gid=0,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait,slotselect -/dev/block/platform/soc/624000.ufshc/by-name/userdata /data ext4 noatime,nosuid,nodev,barrier=1,noauto_da_alloc latemount,wait,check,formattable,fileencryption=ice,quota -/dev/block/zram0 none swap defaults zramsize=536870912 -/dev/block/platform/soc/624000.ufshc/by-name/misc /misc emmc defaults defaults -/devices/*/xhci-hcd.0.auto/usb* auto vfat defaults voldmanaged=usb:auto +#TODO: Add 'check' as fs_mgr_flags with data partition. +# Currently we dont have e2fsck compiled. So fs check would failed. +# NOTE: fstab.aosp_common is used for aosp. Make changes there as well. +#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags> +/dev/block/platform/soc/624000.ufshc/by-name/system / ext4 ro,barrier=1 wait,slotselect,verify +# 'vendor' partition is now early-mounted and fstab entry is specified in device tree +# /dev/block/platform/soc/624000.ufshc/by-name/vendor /vendor ext4 ro,barrier=1 wait,slotselect,verify +/dev/block/platform/soc/624000.ufshc/by-name/modem /firmware/radio vfat ro,shortname=lower,uid=1000,gid=0,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait,slotselect +/dev/block/platform/soc/624000.ufshc/by-name/userdata /data ext4 noatime,nosuid,nodev,barrier=1,noauto_da_alloc latemount,wait,check,formattable,fileencryption=ice,quota +/dev/block/zram0 none swap defaults zramsize=536870912 +/dev/block/platform/soc/624000.ufshc/by-name/misc /misc emmc defaults defaults +/devices/*/xhci-hcd.0.auto/usb* auto vfat defaults voldmanaged=usb:auto |