From e8d42059e61d52228adf6a4a6384ad683196d732 Mon Sep 17 00:00:00 2001
From: Jaegeuk Kim <jaegeuk@google.com>
Date: Thu, 23 Sep 2021 16:54:24 -0700
Subject: [PATCH] Deprecated ext4 for RW partitions: /persist

Bug: 200853457
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I64bfce98dfa4565dff9a6fbfd6e2d843583e5e66
---
 BoardConfig-common.mk | 3 +++
 conf/fstab.persist    | 1 +
 2 files changed, 4 insertions(+)

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index afbea635..def9de01 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -166,6 +166,9 @@ TARGET_COPY_OUT_PRODUCT := product
 BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4
 TARGET_COPY_OUT_SYSTEM_EXT := system_ext
 
+# persist.img
+BOARD_PERSISTIMAGE_FILE_SYSTEM_TYPE := f2fs
+
 ########################
 # Video Codec
 ########################
diff --git a/conf/fstab.persist b/conf/fstab.persist
index 779a05d5..ab0631b6 100644
--- a/conf/fstab.persist
+++ b/conf/fstab.persist
@@ -1,4 +1,5 @@
 # Android fstab file.
 # <src>                  <mnt_point>         <type>    <mnt_flags and options>                               <fs_mgr_flags>
 # Keep persist in an fstab file, since we need to run fsck on it after abnormal shutdown.
+/dev/block/platform/14700000.ufs/by-name/persist  /mnt/vendor/persist f2fs      noatime,nosuid,nodev,sync wait,check,formattable
 /dev/block/platform/14700000.ufs/by-name/persist  /mnt/vendor/persist ext4      noatime,nosuid,nodev,data=journal,commit=1 wait,check,formattable,metadata_csum