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

Commit 05e1cdb3 authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge "Revert "init.rc: stop calling 'fsverity_init --load-verified-keys'""... 

Merge "Revert "init.rc: stop calling 'fsverity_init --load-verified-keys'"" into main am: 428622bb am: 82161b0c am: f68b038e am: 503fa1ec

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2676760



Change-Id: Iac28fb4c0562f148cae94f45e4d72437ed8baf18
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f27f8d8a 503fa1ec

rootdir/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -20,7 +20,10 @@ prebuilt_etc { 
    name: "init.rc",

    src: "init.rc",

    sub_dir: "init/hw",

    required: ["platform-bootclasspath"],

    required: [

        "fsverity_init",

        "platform-bootclasspath",

    ],

}



prebuilt_etc {

rootdir/init.rc

+3 −0
Original line number Diff line number Diff line
@@ -649,6 +649,9 @@ on late-fs 
    # HALs required before storage encryption can get unlocked (FBE)

    class_start early_hal



    # Load trusted keys from dm-verity protected partitions

    exec -- /system/bin/fsverity_init --load-verified-keys



# Only enable the bootreceiver tracing instance for kernels 5.10 and above.

on late-fs && property:ro.kernel.version=4.9

    setprop bootreceiver.enable 0