From 4adb3b01a4edaa9538e2ddc29e4c3b1a96b9973c Mon Sep 17 00:00:00 2001 From: timocapa Date: Wed, 20 Apr 2022 02:44:17 +0200 Subject: [PATCH] sm6150-common: fstab: Fix fsmgr flag for F2FS Compression - Without this, F2FS Compression would not work as this flag will be passed to recovery at format-time. Change-Id: I29082d680320cebda6d3c1457318555bb33ba1b7 Signed-off-by: timocapa Signed-off-by: donjohanliebert --- rootdir/etc/fstab.default | 2 +- rootdir/etc/fstab.emmc | 2 +- rootdir/etc/recovery.fstab | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rootdir/etc/fstab.default b/rootdir/etc/fstab.default index 5b13af1..e1b30fd 100644 --- a/rootdir/etc/fstab.default +++ b/rootdir/etc/fstab.default @@ -47,7 +47,7 @@ odm /odm /dev/block/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard wait,check,formattable,first_stage_mount # Add fs_mgr flag - sysfs_path=/sys/devices/platform/soc/xxxx.[ufshc|sdhci] to userdata entry, based on UFS|eMMC device. -/dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,inlinecrypt,background_gc=sync,gc_merge,atgc,checkpoint_merge,compress_extension=apk,compress_extension=apex,compress_extension=so latemount,wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized+wrappedkey_v0,metadata_encryption=aes-256-xts:wrappedkey_v0,keydirectory=/metadata/vold/metadata_encryption,quota,reservedsize=128M,checkpoint=fs +/dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,inlinecrypt,background_gc=sync,gc_merge,atgc,checkpoint_merge,compress_extension=apk,compress_extension=apex,compress_extension=so latemount,wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized+wrappedkey_v0,metadata_encryption=aes-256-xts:wrappedkey_v0,keydirectory=/metadata/vold/metadata_encryption,fscompress,quota,reservedsize=128M,checkpoint=fs /devices/platform/soc/8804000.sdhci/mmc_host* /storage/sdcard1 vfat nosuid,nodev wait,voldmanaged=sdcard1:auto,encryptable=footer /devices/platform/soc/1da4000.ufshc_card/host* /storage/sdcard1 vfat nosuid,nodev wait,voldmanaged=sdcard1:auto,encryptable=footer /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 diff --git a/rootdir/etc/fstab.emmc b/rootdir/etc/fstab.emmc index 7d0fcd6..805ed57 100644 --- a/rootdir/etc/fstab.emmc +++ b/rootdir/etc/fstab.emmc @@ -47,7 +47,7 @@ odm /odm /dev/block/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard wait,formattable,first_stage_mount # Add fs_mgr flag - sysfs_path=/sys/devices/platform/soc/xxxx.[ufshc|sdhci] to userdata entry, based on UFS|eMMC device. -/dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,inlinecrypt,background_gc=sync,gc_merge,atgc,checkpoint_merge,compress_extension=apk,compress_extension=apex,compress_extension=so latemount,wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts:v2+emmc_optimized+wrappedkey_v0,metadata_encryption=aes-256-xts:wrappedkey_v0,keydirectory=/metadata/vold/metadata_encryption,quota,reservedsize=128M,checkpoint=fs +/dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,inlinecrypt,background_gc=sync,gc_merge,atgc,checkpoint_merge,compress_extension=apk,compress_extension=apex,compress_extension=so latemount,wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts:v2+emmc_optimized+wrappedkey_v0,metadata_encryption=aes-256-xts:wrappedkey_v0,keydirectory=/metadata/vold/metadata_encryption,fscompress,quota,reservedsize=128M,checkpoint=fs /devices/platform/soc/8804000.sdhci/mmc_host* /storage/sdcard1 vfat nosuid,nodev wait,voldmanaged=sdcard1:auto,encryptable=footer /devices/platform/soc/1da4000.ufshc_card/host* /storage/sdcard1 vfat nosuid,nodev wait,voldmanaged=sdcard1:auto,encryptable=footer /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 diff --git a/rootdir/etc/recovery.fstab b/rootdir/etc/recovery.fstab index 40e4cfc..978e1ac 100644 --- a/rootdir/etc/recovery.fstab +++ b/rootdir/etc/recovery.fstab @@ -39,7 +39,7 @@ product /product ext4 ro,barrier=1, product /product erofs ro wait,avb=vbmeta_system,logical,first_stage_mount /dev/block/bootdevice/by-name/cache /cache ext4 noatime,nosuid,nodev,barrier=1,data=ordered wait,check /dev/block/bootdevice/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard wait,check,formattable,first_stage_mount -/dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,background_gc=sync,gc_merge,atgc,checkpoint_merge,compress_extension=apk,compress_extension=apex,compress_extension=so wait,check,encryptable=footer +/dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,background_gc=sync,gc_merge,atgc,checkpoint_merge,compress_extension=apk,compress_extension=apex,compress_extension=so wait,check,encryptable=footer,fscompress /dev/block/mmcblk1p1 /sdcard vfat nosuid,nodev wait /dev/block/bootdevice/by-name/boot /boot emmc defaults defaults /dev/block/bootdevice/by-name/recovery /recovery emmc defaults defaults