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

Revert submission 2662658-fsverity-init-cleanup

Reason for revert: Culprit for test breakage b/293232766

Reverted changes: /q/submissionid:2662658-fsverity-init-cleanup

Change-Id: I77086f955a53eec274166b7395a88b7dc0e1ad53
This commit is contained in:
Yunkai Lim 2023-07-26 06:21:30 +00:00 committed by Gerrit Code Review
parent 7acaea6770
commit 9292f74fc1
2 changed files with 7 additions and 1 deletions

View file

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

View file

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