Merge changes from topic "fsverity-init-cleanup" into main am: 42164ff920 am: 0a4764fa46 am: 2bbf32dae5 am: 7fad65e822
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2650779
Change-Id: I471a4747f4d4d0541fe27608243658839de7ac9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 1a0a35f..07bb4ed 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -1041,13 +1041,9 @@
# Must start after 'derive_classpath' to have *CLASSPATH variables set.
start odsign
- # Before we can lock keys and proceed to the next boot stage, wait for
- # odsign to be done with the key
+ # Wait for odsign to be done with the key.
wait_for_prop odsign.key.done 1
- # Lock the fs-verity keyring, so no more keys can be added
- exec -- /system/bin/fsverity_init --lock
-
# Bump the boot level to 1000000000; this prevents further on-device signing.
# This is a special value that shuts down the thread which listens for
# further updates.