From b37e47c9d161109d3635a6c028ba9cab24deab46 Mon Sep 17 00:00:00 2001 From: Immanuel Raj Date: Tue, 26 Jul 2022 22:13:41 +0530 Subject: [PATCH] sdm660-common: Add `fsverity` flag to userdata After many comments and logs and research this was found to be missing and causing error Ref https://forum.xda-developers.com/t/rom-12-xiaomi-mi-a2-pixelexperience-aosp-25-07-2022.4406351/post-87199577 Meanwhile adding this line in the fstab fixes this stuff Ref https://android-review.googlesource.com/c/device/google/cuttlefish/+/1458807 first Api level>=30 doesnt need that flag but sadly we are 27 so yeah lets add it Signed-off-by: Immanuel Raj Signed-off-by: pix106 --- rootdir/etc/fstab.qcom | 4 ++-- rootdir/etc/fstab_A.qcom | 4 ++-- rootdir/etc/fstab_AB.qcom | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom index 9fee419c..ff08e38c 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% -/dev/block/bootdevice/by-name/userdata /data ext4 nodev,noatime,nosuid,barrier=1,noauto_da_alloc,discard,lazytime wait,check,fileencryption=ice,reservedsize=128M -/dev/block/bootdevice/by-name/userdata /data f2fs nodev,noatime,nosuid,nodiratime,fsync_mode=nobarrier,background_gc=off wait,check,fileencryption=ice,reservedsize=128M +/dev/block/bootdevice/by-name/userdata /data ext4 nodev,noatime,nosuid,barrier=1,noauto_da_alloc,discard,lazytime wait,check,fileencryption=ice,reservedsize=128M,fsverity +/dev/block/bootdevice/by-name/userdata /data f2fs nodev,noatime,nosuid,nodiratime,fsync_mode=nobarrier,background_gc=off wait,check,fileencryption=ice,reservedsize=128M,fsverity /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/fstab_A.qcom b/rootdir/etc/fstab_A.qcom index c5a41375..23c02a34 100644 --- a/rootdir/etc/fstab_A.qcom +++ b/rootdir/etc/fstab_A.qcom @@ -12,8 +12,8 @@ # /dev/block/zram0 none swap defaults zramsize=50% /dev/block/bootdevice/by-name/system / ext4 ro,barrier=1,discard wait,avb -/dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,barrier=1,discard,noauto_da_alloc,noatime,lazytime wait,check,formattable,fileencryption=ice,reservedsize=128M -/dev/block/bootdevice/by-name/userdata /data f2fs nosuid,nodev,nodiratime,fsync_mode=nobarrier,background_gc=off wait,check,formattable,fileencryption=ice,reservedsize=128M +/dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,barrier=1,discard,noauto_da_alloc,noatime,lazytime wait,check,formattable,fileencryption=ice,reservedsize=128M,fsverity +/dev/block/bootdevice/by-name/userdata /data f2fs nosuid,nodev,nodiratime,fsync_mode=nobarrier,background_gc=off wait,check,formattable,fileencryption=ice,reservedsize=128M,fsverity /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/fstab_AB.qcom b/rootdir/etc/fstab_AB.qcom index 20239e7b..db62090a 100644 --- a/rootdir/etc/fstab_AB.qcom +++ b/rootdir/etc/fstab_AB.qcom @@ -9,8 +9,8 @@ # /dev/block/zram0 none swap defaults zramsize=50% /dev/block/bootdevice/by-name/system / ext4 ro,barrier=1,discard wait,slotselect -/dev/block/bootdevice/by-name/userdata /data ext4 nodev,noatime,nosuid,barrier=1,noauto_da_alloc,discard,lazytime wait,check,encryptable=footer,formattable,length=-16384 -/dev/block/bootdevice/by-name/userdata /data f2fs nodev,noatime,nosuid,inline_xattr,reserve_root=32768,resgid=1065,background_gc=on wait,check,encryptable=footer,formattable,length=-16384 +/dev/block/bootdevice/by-name/userdata /data ext4 nodev,noatime,nosuid,barrier=1,noauto_da_alloc,discard,lazytime wait,check,encryptable=footer,formattable,length=-16384,fsverity +/dev/block/bootdevice/by-name/userdata /data f2fs nodev,noatime,nosuid,inline_xattr,reserve_root=32768,resgid=1065,background_gc=on wait,check,encryptable=footer,formattable,length=-16384,fsverity /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