ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge changes from topic "fsverity-init-cleanup" into main am: 42164ff920 am: 0a4764fa46 am: 2bbf32dae5 am: 7fad65e822

Browse source 
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>
This commit is contained in:
Eric Biggers 2023-07-17 22:53:51 +00:00 • committed by Automerger Merge Worker
commit 28d1536034
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
rootdir/init.rc
View file

@ -1041,13 +1041,9 @@ on post-fs-data
# 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.