From bb671d51441821878a0462929e55b4cbeb196948 Mon Sep 17 00:00:00 2001 From: pix106 Date: Wed, 17 Aug 2022 14:57:50 +0200 Subject: [PATCH] sdm660-common: Switch back to FBE v1 for fstab.qcom This reverts commit 67ad9e979fa9ad01c1226c6a2ebe8e003f26ea22. --- rootdir/etc/fstab.qcom | 4 ++-- rootdir/etc/init.target.rc | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom index 428bcd90..5ab239f3 100644 --- a/rootdir/etc/fstab.qcom +++ b/rootdir/etc/fstab.qcom @@ -12,8 +12,8 @@ # Non-A/B fstab.qcom variant # /dev/block/zram0 none swap defaults zramsize=50%,max_comp_streams=8,zram_backingdev_size=512M -/dev/block/bootdevice/by-name/userdata /data ext4 nodev,noatime,nosuid,barrier=1,noauto_da_alloc,discard,lazytime latemount,wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts:v2+emmc_optimized,quota,reservedsize=128M,checkpoint=fs -/dev/block/bootdevice/by-name/userdata /data f2fs nodev,noatime,nosuid,nodiratime,fsync_mode=nobarrier,background_gc=off latemount,wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts:v2+emmc_optimized,quota,reservedsize=128M,checkpoint=fs +/dev/block/bootdevice/by-name/userdata /data ext4 nodev,noatime,nosuid,barrier=1,noauto_da_alloc,discard,lazytime wait,check,fileencryption=ice,quota,reservedsize=128M +/dev/block/bootdevice/by-name/userdata /data f2fs nodev,noatime,nosuid,nodiratime,fsync_mode=nobarrier,background_gc=off wait,check,fileencryption=ice,quota,reservedsize=128M /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 /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 diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc index 12d64d25..2f9f319c 100755 --- a/rootdir/etc/init.target.rc +++ b/rootdir/etc/init.target.rc @@ -152,6 +152,8 @@ on init on fs wait /dev/block/platform/soc/${ro.boot.bootdevice} symlink /dev/block/platform/soc/${ro.boot.bootdevice} /dev/block/bootdevice + mount_all /vendor/etc/fstab.qcom + swapon_all /vendor/etc/fstab.qcom chown root system /mnt/vendor/persist chmod 0771 /mnt/vendor/persist mkdir /mnt/vendor/persist/data 0700 system system