From 1ef792a230b2549b74abada0dc616739f7c8a083 Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Wed, 6 Nov 2024 17:35:21 -0800 Subject: [PATCH] Move modem setup to init.persist.rc When the modem setup is done is init.efs.rc file, there is boot time regression in the 4kb configuration. Bug: 374435821 Flag: EXEMPT bugfix Test: Build and tested in abtd Change-Id: I909f9eb45f783fda45e7782419845d236c263aa0 --- conf/init.efs.16k.rc | 11 +---------- conf/init.efs.4k.rc | 9 --------- conf/init.persist.rc | 8 ++++++++ 3 files changed, 9 insertions(+), 19 deletions(-) diff --git a/conf/init.efs.16k.rc b/conf/init.efs.16k.rc index 121c6fd..e52ff78 100644 --- a/conf/init.efs.16k.rc +++ b/conf/init.efs.16k.rc @@ -1,5 +1,5 @@ # This RC file is used for: -# - 16kb Developer option +# - 16kb Developer option which can boot with 4kb/16kb page size. # - 16kb targets only service copy_efs_files_to_data /vendor/bin/copy_efs_files_to_data @@ -20,12 +20,3 @@ on post-fs-data && property:ro.boot.hardware.cpu.pagesize=16384 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 - restorecon_recursive /mnt/vendor/efs_backup - chown radio system /mnt/vendor/efs_backup - restorecon_recursive /mnt/vendor/modem_userdata - chown radio system /mnt/vendor/modem_userdata diff --git a/conf/init.efs.4k.rc b/conf/init.efs.4k.rc index b930d01..5393e67 100644 --- a/conf/init.efs.4k.rc +++ b/conf/init.efs.4k.rc @@ -1,11 +1,2 @@ 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 - restorecon_recursive /mnt/vendor/efs_backup - chown radio system /mnt/vendor/efs_backup - restorecon_recursive /mnt/vendor/modem_userdata - chown radio system /mnt/vendor/modem_userdata diff --git a/conf/init.persist.rc b/conf/init.persist.rc index 271910a..624eb79 100644 --- a/conf/init.persist.rc +++ b/conf/init.persist.rc @@ -3,6 +3,14 @@ on early-init && property:ro.boot.hardware.cpu.pagesize=4096 setprop ro.vendor.persist.status mounted on property:ro.vendor.persist.status=mounted + # for modem related functions + restorecon_recursive /mnt/vendor/efs + chown radio system /mnt/vendor/efs + restorecon_recursive /mnt/vendor/efs_backup + chown radio system /mnt/vendor/efs_backup + restorecon_recursive /mnt/vendor/modem_userdata + chown radio system /mnt/vendor/modem_userdata + # for battery defender mkdir /mnt/vendor/persist/battery 0700 system system