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

Commit 65170370 authored by Victor Hsieh's avatar Victor Hsieh Committed by android-build-merger
Browse files

Merge "Move fsverity_init to after class_start core" 

am: 9a7e1eff

Change-Id: I219b538f4d8359cb9393261954a1b8e9aebbe427
parents 74043e44 9a7e1eff

rootdir/init.rc

+3 −4
Original line number Original line Diff line number Diff line
@@ -489,10 +489,6 @@ on post-fs-data 
    mkdir /data/bootchart 0755 shell shell

    mkdir /data/bootchart 0755 shell shell

    bootchart start

    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

    # Make sure that apexd is started in the default namespace

    enter_default_mount_ns

    enter_default_mount_ns
@@ -824,6 +820,9 @@ on boot 




    class_start core

    class_start core





    # Requires keystore (currently a core service) to be ready first.

    exec -- /system/bin/fsverity_init



on nonencrypted

on nonencrypted

    class_start main

    class_start main

    class_start late_start

    class_start late_start