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

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

Change-Id: Ibb90ec4b0d816514def6522eb761fb7ac0a9ecfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eric Biggers 2023-07-26 00:35:03 +00:00 committed by Automerger Merge Worker
commit 534840eeab
2 changed files with 1 additions and 7 deletions

View file

@ -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 {

View file

@ -649,9 +649,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