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

Commit 3f4cf1f1 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 am: 65170370 am: d5aaf571

am: a02d2734

Change-Id: I0c3e956bcabdc157b44c417acab6aea221f19a39
parents 42604592 a02d2734
Loading
Loading
Loading
Loading
+3 −4
Original line number Diff line number Diff line
@@ -489,10 +489,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

@@ -824,6 +820,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