summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2022-10-06 18:07:26 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-10-06 18:07:26 +0000
commita4d8009f7ac21691bfe6625f0f30bc790e41cb05 (patch)
tree8580f688f085dcc689bb19527892c4ed7638e31f
parentdff8288b087cdb1cf080084b3818f9d160523112 (diff)
parentd1ebd74b503da06044923a6ca3603ce41f373ff9 (diff)
downloadyukawa-a4d8009f7ac21691bfe6625f0f30bc790e41cb05.tar.gz
yukawa: Set proper mount options for f2fs am: d1ebd74b50
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/2240870 Change-Id: I1e2b76faca88ee4f08fbafdbb5232f1c7009e4c0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--fstab.recovery.yukawa4
-rw-r--r--fstab.recovery.yukawa.avb2
-rw-r--r--fstab.yukawa2
-rw-r--r--fstab.yukawa.ab4
-rw-r--r--fstab.yukawa.avb.ab4
5 files changed, 8 insertions, 8 deletions
diff --git a/fstab.recovery.yukawa b/fstab.recovery.yukawa
index 9fddb1e..177896c 100644
--- a/fstab.recovery.yukawa
+++ b/fstab.recovery.yukawa
@@ -2,9 +2,9 @@ system /system erofs ro wait,logical,first_stage_mount
system /system ext4 noatime,ro,errors=panic wait,logical,first_stage_mount
vendor /vendor erofs ro wait,logical,first_stage_mount
vendor /vendor ext4 noatime,ro,errors=panic wait,logical,first_stage_mount
-/dev/block/platform/soc/ffe07000.mmc/by-name/userdata /data f2fs noatime,nosuid,nodev latemount,wait,check,quota,fileencryption=software,quota
+/dev/block/platform/soc/ffe07000.mmc/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065 latemount,wait,check,fileencryption=software,quota,formattable
/dev/block/platform/soc/ffe07000.mmc/by-name/userdata /data ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic latemount,wait,check,quota,formattable,reservedsize=32M
/dev/block/platform/soc/ffe07000.mmc/by-name/cache /cache ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic latemount,wait,check,formattable
-/dev/block/platform/soc/ffe07000.mmc/by-name/misc /misc emmc defaults defaults
+/dev/block/platform/soc/ffe07000.mmc/by-name/misc /misc emmc defaults defaults
/dev/block/platform/soc/ffe07000.mmc/by-name/recovery /recovery emmc defaults defaults
/dev/block/platform/soc/ffe07000.mmc/by-name/boot /boot emmc defaults defaults \ No newline at end of file
diff --git a/fstab.recovery.yukawa.avb b/fstab.recovery.yukawa.avb
index 0dbc5ba..7712880 100644
--- a/fstab.recovery.yukawa.avb
+++ b/fstab.recovery.yukawa.avb
@@ -2,7 +2,7 @@ system /system erofs ro wait,avb=vbmeta,logical,first_stage_mount
system /system ext4 noatime,ro,errors=panic wait,avb=vbmeta,logical,first_stage_mount
vendor /vendor erofs ro wait,avb,logical,first_stage_mount
vendor /vendor ext4 noatime,ro,errors=panic wait,avb,logical,first_stage_mount
-/dev/block/platform/soc/ffe07000.mmc/by-name/userdata /data f2fs noatime,nosuid,nodev latemount,wait,check,quota,fileencryption=software,quota
+/dev/block/platform/soc/ffe07000.mmc/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065 latemount,wait,check,fileencryption=software,quota,formattable
/dev/block/platform/soc/ffe07000.mmc/by-name/userdata /data ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic latemount,wait,check,quota,formattable,reservedsize=32M
/dev/block/platform/soc/ffe07000.mmc/by-name/cache /cache ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic latemount,wait,check,formattable
/dev/block/platform/soc/ffe07000.mmc/by-name/misc /misc emmc defaults defaults
diff --git a/fstab.yukawa b/fstab.yukawa
index 409f076..c44cd73 100644
--- a/fstab.yukawa
+++ b/fstab.yukawa
@@ -1,4 +1,4 @@
-/dev/block/platform/soc/ffe07000.mmc/by-name/userdata /data f2fs noatime,nosuid,nodev latemount,wait,check,quota,fileencryption=software,quota
+/dev/block/platform/soc/ffe07000.mmc/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065 latemount,wait,check,fileencryption=software,quota,formattable
/dev/block/platform/soc/ffe07000.mmc/by-name/userdata /data ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic latemount,wait,check,quota,formattable,reservedsize=32M
/dev/block/platform/soc/ffe07000.mmc/by-name/cache /cache ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic latemount,wait,check,formattable
/dev/block/platform/soc/ffe07000.mmc/by-name/misc /misc emmc defaults defaults
diff --git a/fstab.yukawa.ab b/fstab.yukawa.ab
index a3c0be4..eafbdf2 100644
--- a/fstab.yukawa.ab
+++ b/fstab.yukawa.ab
@@ -2,8 +2,8 @@ system /system erofs ro wait,slotselect,logical,first_stage_mount
system /system ext4 noatime,ro,errors=panic wait,slotselect,logical,first_stage_mount
vendor /vendor erofs ro wait,slotselect,logical,first_stage_mount
vendor /vendor ext4 noatime,ro,errors=panic wait,slotselect,logical,first_stage_mount
-/dev/block/by-name/userdata /data f2fs noatime,nosuid,nodev latemount,wait,check,quota,fileencryption=software,quota
-/dev/block//by-name/userdata /data ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic latemount,wait,check,quota,formattable,reservedsize=32M
+/dev/block/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065 latemount,wait,check,fileencryption=software,quota,formattable
+/dev/block/by-name/userdata /data ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic latemount,wait,check,quota,formattable,reservedsize=32M
/dev/block/by-name/misc /misc emmc defaults defaults
*/block/mmcblk0 auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata
*/block/sd* auto auto defaults voldmanaged=usb:auto,noemulatedsd
diff --git a/fstab.yukawa.avb.ab b/fstab.yukawa.avb.ab
index e6c18fc..b36026a 100644
--- a/fstab.yukawa.avb.ab
+++ b/fstab.yukawa.avb.ab
@@ -2,8 +2,8 @@ system /system erofs ro wait,slotselect,avb=vbmeta,logical,first_stag
system /system ext4 noatime,ro,errors=panic wait,slotselect,avb=vbmeta,logical,first_stage_mount
vendor /vendor erofs ro wait,slotselect,avb,logical,first_stage_mount
vendor /vendor ext4 noatime,ro,errors=panic wait,slotselect,avb,logical,first_stage_mount
-/dev/block/by-name/userdata /data f2fs noatime,nosuid,nodev latemount,wait,check,quota,fileencryption=software,quota
-/dev/block//by-name/userdata /data ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic latemount,wait,check,quota,formattable,reservedsize=32M
+/dev/block/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065 latemount,wait,check,quota,fileencryption=software,quota
+/dev/block/by-name/userdata /data ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic latemount,wait,check,quota,formattable,reservedsize=32M
/dev/block/by-name/misc /misc emmc defaults defaults
*/block/mmcblk0 auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata
*/block/sd* auto auto defaults voldmanaged=usb:auto,noemulatedsd