Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8129f861 authored by Victor Hsieh's avatar Victor Hsieh
Browse files

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
parent 50e408db

rootdir/init.rc

+3 −4
Original line number Diff line number Diff line
@@ -452,10 +452,6 @@ on post-fs-data 
    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 @@ on boot 


    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