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

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

Merge "init.rc: stop calling 'fsverity_init --load-verified-keys'" into main am: 5aade9ca

parents 488f4b5a 5aade9ca
Loading
Loading
Loading
Loading
+1 −4
Original line number Diff line number Diff line
@@ -20,10 +20,7 @@ prebuilt_etc {
    name: "init.rc",
    src: "init.rc",
    sub_dir: "init/hw",
    required: [
        "fsverity_init",
        "platform-bootclasspath",
    ],
    required: ["platform-bootclasspath"],
}

prebuilt_etc {
+0 −3
Original line number Diff line number Diff line
@@ -629,9 +629,6 @@ 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