diff options
| -rw-r--r-- | BoardConfigCommon.mk | 2 | ||||
| -rw-r--r-- | rootdir/etc/fstab.full | 24 | ||||
| -rw-r--r-- | rootdir/etc/fstab.qcom | 4 |
3 files changed, 4 insertions, 26 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index edbedfb..113d6b5 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -184,7 +184,7 @@ BOARD_USES_QCOM_HARDWARE := true TARGET_HAS_NO_WIFI_STATS := true # Recovery -TARGET_RECOVERY_FSTAB := $(VENDOR_PATH)/rootdir/etc/fstab.full +TARGET_RECOVERY_FSTAB := $(VENDOR_PATH)/rootdir/etc/fstab.qcom TARGET_USERIMAGES_USE_EXT4 := true TARGET_USERIMAGES_USE_F2FS := true diff --git a/rootdir/etc/fstab.full b/rootdir/etc/fstab.full deleted file mode 100644 index 9b63c3d..0000000 --- a/rootdir/etc/fstab.full +++ /dev/null @@ -1,24 +0,0 @@ -# Android fstab file. -# 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 - -#TODO: Add 'check' as fs_mgr_flags with data partition. -# Currently we dont have e2fsck compiled. So fs check would failed. - -#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags> -/dev/block/bootdevice/by-name/boot /boot emmc defaults defaults -/dev/block/bootdevice/by-name/recovery /recovery emmc defaults defaults -/dev/block/bootdevice/by-name/system /system ext4 ro,barrier=1 wait -/dev/block/bootdevice/by-name/factory /vendor ext4 ro,barrier=1 wait -/dev/block/bootdevice/by-name/userdata /data f2fs nosuid,nodev,noatime,inline_xattr,data_flush wait,check,encryptable=footer,quota -/dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,noatime,barrier=1,noauto_da_alloc wait,check,encryptable=footer,quota -/dev/block/bootdevice/by-name/cache /cache f2fs nosuid,nodev,noatime,inline_xattr,flush_merge,data_flush wait,check -/dev/block/bootdevice/by-name/cache /cache ext4 nosuid,nodev,noatime,barrier=1 wait,check -/dev/block/bootdevice/by-name/persist /persist ext4 nosuid,nodev,noatime,barrier=1 wait -/dev/block/bootdevice/by-name/dsp /dsp ext4 ro,nosuid,nodev,barrier=1 wait -/dev/block/bootdevice/by-name/modem /firmware vfat ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait -/dev/block/bootdevice/by-name/bluetooth /bt_firmware vfat ro,shortname=lower,uid=1002,gid=3002,dmask=222,fmask=333,context=u:object_r:bt_firmware_file:s0 wait -/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults -/dev/block/zram0 none swap defaults zramsize=536870912,max_comp_streams=4 - -/devices/soc/6a00000.ssusb/6a00000.dwc3/xhci-hcd.0.auto/usb* auto auto defaults voldmanaged=usbdisk:auto diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom index b1bc993..9133cbd 100644 --- a/rootdir/etc/fstab.qcom +++ b/rootdir/etc/fstab.qcom @@ -2,7 +2,7 @@ # The filesystem that contains the filesystem e2fsck binary (typically /system) cannot # specify 'check', and must come before any filesystems that do specify 'check' -# NOTE: /system and /vendor (/factory mounted as /vendor) partitions are now early-mounted and the fstab entry is specified in device tree: +# NOTE: /system and /vendor (/factory mounted as /vendor) partitions are now early-mounted and the fstab entry is specified in device tree (duplicated below for recovery image purposes only): # /proc/device-tree/firmware/android/fstab/system # /proc/device-tree/firmware/android/fstab/vendor @@ -11,6 +11,8 @@ /dev/block/bootdevice/by-name/recovery /recovery emmc defaults defaults /dev/block/bootdevice/by-name/userdata /data f2fs nosuid,nodev,noatime,inline_xattr,data_flush wait,check,encryptable=footer /dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,noatime,barrier=1,noauto_da_alloc wait,check,encryptable=footer +/dev/block/bootdevice/by-name/system /system ext4 ro,barrier=1 wait,recoveryonly +/dev/block/bootdevice/by-name/factory /vendor ext4 ro,barrier=1 wait,recoveryonly /dev/block/bootdevice/by-name/cache /cache f2fs nosuid,nodev,noatime,inline_xattr,flush_merge,data_flush wait,check /dev/block/bootdevice/by-name/cache /cache ext4 nosuid,nodev,noatime,barrier=1 wait,check /dev/block/bootdevice/by-name/persist /persist ext4 nosuid,nodev,noatime,barrier=1 wait |