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>
diff --git a/rootdir/Android.bp b/rootdir/Android.bp
index e98733a..65865a6 100644
--- a/rootdir/Android.bp
+++ b/rootdir/Android.bp
@@ -20,10 +20,7 @@
name: "init.rc",
src: "init.rc",
sub_dir: "init/hw",
- required: [
- "fsverity_init",
- "platform-bootclasspath",
- ],
+ required: ["platform-bootclasspath"],
}
prebuilt_etc {
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 07bb4ed..6693b75 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -649,9 +649,6 @@
# 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