From 83e0b84caf41c42fd3f0b6494017570bd88f6e6e Mon Sep 17 00:00:00 2001
From: Jaegeuk Kim <jaegeuk@google.com>
Date: Thu, 21 Jul 2022 17:19:34 -0700
Subject: [PATCH] Use EXT4 for /persist

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

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 34620e75..9ca97737 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -184,7 +184,7 @@ BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4
 TARGET_COPY_OUT_SYSTEM_EXT := system_ext
 
 # persist.img
-BOARD_PERSISTIMAGE_FILE_SYSTEM_TYPE := f2fs
+BOARD_PERSISTIMAGE_FILE_SYSTEM_TYPE := ext4
 
 ########################
 # Video Codec
diff --git a/conf/fstab.persist b/conf/fstab.persist
index ab0631b6..b9dda71a 100644
--- a/conf/fstab.persist
+++ b/conf/fstab.persist
@@ -1,5 +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
+/dev/block/platform/14700000.ufs/by-name/persist  /mnt/vendor/persist f2fs      noatime,nosuid,nodev,sync wait,check,formattable