From 2a8f6806b25d4e7d25797182f77dd38724befcdd Mon Sep 17 00:00:00 2001
From: Juan Yescas <jyescas@google.com>
Date: Mon, 14 Oct 2024 14:54:41 -0700
Subject: [PATCH] Mount efs and persist partitions at right stage for 4kb and
 16kb

Bug: 373455889
Bug: 347108593
Test: Built and flash zumapro device
Flag: EXEMPT bugfix
Change-Id: Ibe8d50d77c47de6fd75df6a22931d4dd0c05399a
---
 conf/init.efs.16k.rc | 11 +++++++++--
 conf/init.efs.4k.rc  |  2 ++
 conf/init.persist.rc |  2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/conf/init.efs.16k.rc b/conf/init.efs.16k.rc
index c2a2eab..121c6fd 100644
--- a/conf/init.efs.16k.rc
+++ b/conf/init.efs.16k.rc
@@ -1,3 +1,7 @@
+# This RC file is used for:
+#    - 16kb Developer option
+#    - 16kb targets only
+
 service copy_efs_files_to_data /vendor/bin/copy_efs_files_to_data
     user root
     group root radio system audio media graphics camera
@@ -5,7 +9,7 @@ service copy_efs_files_to_data /vendor/bin/copy_efs_files_to_data
     oneshot
     disabled
 
-on post-fs-data
+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
@@ -14,7 +18,10 @@ on post-fs-data
     restorecon_recursive /data/vendor/ss
     setprop ro.vendor.persist.status mounted
 
-on late-fs
+on late-fs && property:ro.boot.hardware.cpu.pagesize=4096
+    mount_all /vendor/etc/fstab.efs --early
+
+on property:ro.vendor.persist.status=mounted
     # for modem related functions
     restorecon_recursive /mnt/vendor/efs
     chown radio system /mnt/vendor/efs
diff --git a/conf/init.efs.4k.rc b/conf/init.efs.4k.rc
index 340976c..b930d01 100644
--- a/conf/init.efs.4k.rc
+++ b/conf/init.efs.4k.rc
@@ -1,5 +1,7 @@
 on late-fs
     mount_all /vendor/etc/fstab.efs --early
+
+on property:ro.vendor.persist.status=mounted
     # for modem related functions
     restorecon_recursive /mnt/vendor/efs
     chown radio system /mnt/vendor/efs
diff --git a/conf/init.persist.rc b/conf/init.persist.rc
index ee68337..800a611 100644
--- a/conf/init.persist.rc
+++ b/conf/init.persist.rc
@@ -1,4 +1,4 @@
-on early-init
+on early-init && property:ro.boot.hardware.cpu.pagesize=4096
     mount_all /vendor/etc/fstab.persist --early
     setprop ro.vendor.persist.status mounted