From 9d0f747603ba99c0b5e48147539a316082efb00c Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <zhangkelvin@google.com>
Date: Tue, 18 Jun 2024 15:55:03 -0700
Subject: [PATCH] Only copy efs files to /data if device is 16K page size

Test: Boot device, test dev options
Bug: 341216848
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:763984677a0630a2100b150c057c3d128a8f6c3d)
Merged-In: I0bf328b8ff90e125dcbca5261fb8dd4e0ad458d8
Change-Id: I0bf328b8ff90e125dcbca5261fb8dd4e0ad458d8
---
 conf/init.efs.16k.rc | 9 ++-------
 conf/init.efs.4k.rc  | 2 +-
 conf/init.persist.rc | 1 +
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/conf/init.efs.16k.rc b/conf/init.efs.16k.rc
index 72ae9894..89e2b57f 100644
--- a/conf/init.efs.16k.rc
+++ b/conf/init.efs.16k.rc
@@ -6,7 +6,7 @@ service copy_efs_files_to_data /vendor/bin/copy_efs_files_to_data
     oneshot
     disabled
 
-on post-fs-data && property:ro.boot.flash.locked=0 && property:ro.fstype.data=ext4
+on post-fs-data && property:ro.boot.hardware.cpu.pagesize=16384
     mkdir /data/vendor/copied 0775 radio system
     restorecon_recursive /data/vendor/copied
     exec_start copy_efs_files_to_data
@@ -15,12 +15,7 @@ on post-fs-data && property:ro.boot.flash.locked=0 && property:ro.fstype.data=ex
     restorecon_recursive /data/vendor/ss
     setprop ro.vendor.persist.status mounted
 
-on post-fs-data && property:ro.boot.flash.locked=0 && property:ro.fstype.data=f2fs
-    mount_all /vendor/etc/fstab.efs
-    mount_all /vendor/etc/fstab.persist
-    setprop ro.vendor.persist.status mounted
-
-on post-fs-data && property:ro.boot.flash.locked=1
+on late-fs && property:ro.boot.hardware.cpu.pagesize=4096
     mount_all /vendor/etc/fstab.efs
     mount_all /vendor/etc/fstab.persist
     setprop ro.vendor.persist.status mounted
diff --git a/conf/init.efs.4k.rc b/conf/init.efs.4k.rc
index 506c7220..60a07a9c 100644
--- a/conf/init.efs.4k.rc
+++ b/conf/init.efs.4k.rc
@@ -1,4 +1,4 @@
-on post-fs-data
+on late-fs
     mount_all /vendor/etc/fstab.efs
     mount_all /vendor/etc/fstab.persist
     setprop ro.vendor.persist.status mounted
diff --git a/conf/init.persist.rc b/conf/init.persist.rc
index 7852c78e..4a4c3ff3 100644
--- a/conf/init.persist.rc
+++ b/conf/init.persist.rc
@@ -31,6 +31,7 @@ on property:ro.vendor.persist.status=mounted
     mkdir /mnt/vendor/persist/data/tz 0700 system system
     mkdir /mnt/vendor/persist/touch 0770 system system
 
+on property:ro.fstype.data=* && property:ro.vendor.persist.status=mounted
     # Proxy for Secure Storage
     mkdir /data/vendor/rebootescrow 0770 hsm hsm
     mkdir /data/vendor/ss 0770 root system