From 67ad9e979fa9ad01c1226c6a2ebe8e003f26ea22 Mon Sep 17 00:00:00 2001 From: Edwin Moquete Date: Tue, 25 Jan 2022 20:37:23 -0400 Subject: [PATCH] sdm660-common: Switch to FBE v2 for fstab.qcom Signed-off-by: pix106 --- properties/vendor.prop | 6 ++++++ rootdir/etc/fstab.qcom | 4 ++-- rootdir/etc/init.target.rc | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/properties/vendor.prop b/properties/vendor.prop index ce3433c7..f04ad559 100644 --- a/properties/vendor.prop +++ b/properties/vendor.prop @@ -117,6 +117,12 @@ vendor.camera.aux.packagelist=com.google.android.GoogleCamera,com.android.camera # Codec2 switch debug.media.codec2=2 +# Crypto +ro.crypto.dm_default_key.options_format.version=2 +ro.crypto.volume.filenames_mode=aes-256-cts +ro.crypto.volume.metadata.method=dm-default-key +ro.crypto.volume.options=::v2 + # DRM drm.service.enabled=true diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom index 07ef30be..f81d92a2 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 wait,check,encryptable=footer,quota,reservedsize=128M -/dev/block/bootdevice/by-name/userdata /data f2fs nodev,noatime,nosuid,nodiratime,fsync_mode=nobarrier,background_gc=off wait,check,encryptable=footer,quota,reservedsize=128M +/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/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 36fdd30c..baddb869 100755 --- a/rootdir/etc/init.target.rc +++ b/rootdir/etc/init.target.rc @@ -141,7 +141,7 @@ 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 + mount_all --early /vendor/etc/fstab.qcom swapon_all /vendor/etc/fstab.qcom chown root system /mnt/vendor/persist chmod 0771 /mnt/vendor/persist @@ -155,6 +155,9 @@ on fs chmod 0644 /mnt/vendor/dsp/fastrpc_shell_3 mount none /mnt/vendor/dsp/fastrpc_shell_3 /vendor/dsp/cdsp/fastrpc_shell_3 bind +on late-fs + mount_all --late /vendor/etc/fstab.qcom + on post-fs start vendor.qseecomd wait_for_prop vendor.sys.listeners.registered true