Move fsverity_init to after class_start core
The script needs to run after keystore, which is now a core service.
Note the previous APEX requirement by ART is no longer needed.
Test: see keys loaded
Bug: 112038744
Change-Id: I02fb6ce193bb301488b259421f120e6aa6cd75b9
diff --git a/rootdir/init.rc b/rootdir/init.rc
index afa1a86..4e24df0 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -452,10 +452,6 @@
mkdir /data/bootchart 0755 shell shell
bootchart start
- # Load fsverity keys. This needs to happen before apexd, as post-install of
- # APEXes may rely on keys.
- exec -- /system/bin/fsverity_init
-
# Make sure that apexd is started in the default namespace
enter_default_mount_ns
@@ -789,6 +785,9 @@
class_start core
+ # Requires keystore (currently a core service) to be ready first.
+ exec -- /system/bin/fsverity_init
+
on nonencrypted
class_start main
class_start late_start