diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 867be517..20bc57dd 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -224,6 +224,7 @@ BOARD_ROOT_EXTRA_SYMLINKS := \ TARGET_COPY_OUT_VENDOR := vendor TARGET_USERIMAGES_USE_EXT4 := true +TARGET_USERIMAGES_USE_F2FS := true TARGET_USES_MKE2FS := true diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom index 3efed1e9..3c4a1432 100644 --- a/rootdir/etc/fstab.qcom +++ b/rootdir/etc/fstab.qcom @@ -3,7 +3,7 @@ # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK # NOTE: /system and /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/system # /proc/device-tree/firmware/android/fstab/vendor #TODO: Add 'check' as fs_mgr_flags with data partition. @@ -11,13 +11,16 @@ # Non-A/B fstab.qcom variant # -/dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,barrier=1,noauto_da_alloc,discard,noatime,lazytime,errors=panic wait,resize,check,encryptable=footer,crashcheck,quota +/dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,barrier=1,noauto_da_alloc,discard,noatime,lazytime wait,check,encryptable=footer,crashcheck,quota,reservedsize=128M +/dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,nodiratime,fsync_mode=nobarrier,background_gc=off wait,check,encryptable=footer,crashcheck,quota,reservedsize=128M +/devices/soc/c084000.sdhci/mmc_host* /storage/sdcard1 vfat nosuid,nodev wait,voldmanaged=sdcard1:auto,encryptable=footer /dev/block/bootdevice/by-name/misc /misc emmc defaults defaults /dev/block/bootdevice/by-name/modem /vendor/firmware_mnt vfat ro,shortname=lower,uid=0,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait /dev/block/bootdevice/by-name/bluetooth /vendor/bt_firmware vfat ro,shortname=lower,uid=1002,gid=3002,dmask=227,fmask=337,context=u:object_r:bt_firmware_file:s0 wait /devices/soc/a800000.ssusb/a800000.dwc3/xhci-hcd.0.auto* /storage/usbotg vfat nosuid,nodev wait,voldmanaged=usbotg:auto /dev/block/bootdevice/by-name/dsp /vendor/dsp ext4 ro,nosuid,nodev,barrier=1 wait /dev/block/bootdevice/by-name/cache /cache ext4 nosuid,nodev,noatime,barrier=1 wait +/dev/block/bootdevice/by-name/cache /cache f2fs noatime,nosuid,nodev,nodiratime,discard,fsync_mode=nobarrier,inline_xattr,inline_data,data_flush wait /dev/block/bootdevice/by-name/persist /mnt/vendor/persist ext4 nosuid,nodev,barrier=1,noatime wait,check /mnt/vendor/persist /persist none bind wait diff --git a/rootdir/etc/fstab_AB.qcom b/rootdir/etc/fstab_AB.qcom index c4a781f8..c884531d 100644 --- a/rootdir/etc/fstab_AB.qcom +++ b/rootdir/etc/fstab_AB.qcom @@ -6,13 +6,15 @@ # Currently we dont have e2fsck compiled. So fs check would failed. # A/B fstab.qcom variant -# -/dev/block/bootdevice/by-name/system / ext4 ro,barrier=1,discard wait,slotselect -/dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,barrier=0,noauto_da_alloc,discard,noatime,lazytime wait,resize,check,crashcheck,quota,encryptable=footer -/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults -/dev/block/bootdevice/by-name/modem /vendor/firmware_mnt vfat ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait,slotselect -/dev/block/bootdevice/by-name/bluetooth /vendor/bt_firmware vfat ro,shortname=lower,uid=1002,gid=3002,dmask=227,fmask=337,context=u:object_r:bt_firmware_file:s0 wait,slotselect +# +/dev/block/bootdevice/by-name/system / ext4 ro,barrier=1,discard wait,slotselect +/dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,barrier=1,noauto_da_alloc,discard,noatime,lazytime wait,check,encryptable=footer,crashcheck,quota,reservedsize=128M +/dev/block/bootdevice/by-name/userdata /data f2fs nosuid,nodev,noatime,inline_xattr,reserve_root=32768,resgid=1065 wait,check,encryptable=footer,reservedsize=128M +/devices/soc/c084000.sdhci/mmc_host* /storage/sdcard1 vfat nosuid,nodev wait,voldmanaged=sdcard1:auto,encryptable=footer +/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults +/dev/block/bootdevice/by-name/modem /vendor/firmware_mnt vfat ro,shortname=lower,uid=0,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait,slotselect +/dev/block/bootdevice/by-name/bluetooth /vendor/bt_firmware vfat ro,shortname=lower,uid=1002,gid=3002,dmask=227,fmask=337,context=u:object_r:bt_firmware_file:s0 wait,slotselect /devices/soc/a800000.ssusb/a800000.dwc3/xhci-hcd.0.auto* /storage/usbotg vfat nosuid,nodev wait,voldmanaged=usbotg:auto -/dev/block/bootdevice/by-name/dsp /vendor/dsp ext4 ro,nosuid,nodev,barrier=1 wait,slotselect -/dev/block/bootdevice/by-name/persist /mnt/vendor/persist ext4 nosuid,nodev,barrier=1,noatime wait,check +/dev/block/bootdevice/by-name/dsp /vendor/dsp ext4 ro,nosuid,nodev,barrier=1 wait,slotselect +/dev/block/bootdevice/by-name/persist /mnt/vendor/persist ext4 noatime,nosuid,nodev,barrier=1 wait /mnt/vendor/persist /persist none bind wait