diff options
| author | Android Merger <noreply-android-build-merger@google.com> | 2019-07-09 17:41:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-07-09 17:41:51 +0000 |
| commit | c8c228d38c3d75f427be9f0492c630533828a42e (patch) | |
| tree | c730455c556b75b834abcedd078de3043ec2f1da | |
| parent | b56d7561ac9cbcb68eda4bd7c4d314d82ec12a79 (diff) | |
| parent | 23b58900d0902e7e6a7fc050b53a26f1f2ef63b8 (diff) | |
| download | core-c8c228d38c3d75f427be9f0492c630533828a42e.tar.gz | |
Merge "Snap for 5600800 from 09b63da610c9a09e19d8a023a2d76fb009004e00 to pi-platform-release am: be7a106971" into pie-cuttlefish-testing
| -rw-r--r-- | rootdir/init.rc | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc index b9464e7fd..f4b208278 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -381,6 +381,10 @@ on late-fs # HALs required before storage encryption can get unlocked (FBE/FDE) class_start early_hal + # Check and mark a successful boot, before mounting userdata with mount_all. + # No-op for non-A/B device. + exec_start update_verifier_nonencrypted + on post-fs-data # We chown/chmod /data again so because mount is run as root + defaults chown system system /data @@ -558,22 +562,16 @@ on post-fs-data # It is recommended to put unnecessary data/ initialization from post-fs-data # to start-zygote in device's init.rc to unblock zygote start. on zygote-start && property:ro.crypto.state=unencrypted - # A/B update verifier that marks a successful boot. - exec_start update_verifier_nonencrypted start netd start zygote start zygote_secondary on zygote-start && property:ro.crypto.state=unsupported - # A/B update verifier that marks a successful boot. - exec_start update_verifier_nonencrypted start netd start zygote start zygote_secondary on zygote-start && property:ro.crypto.state=encrypted && property:ro.crypto.type=file - # A/B update verifier that marks a successful boot. - exec_start update_verifier_nonencrypted start netd start zygote start zygote_secondary @@ -700,15 +698,11 @@ on property:vold.decrypt=trigger_post_fs_data trigger zygote-start on property:vold.decrypt=trigger_restart_min_framework - # A/B update verifier that marks a successful boot. - exec_start update_verifier class_start main on property:vold.decrypt=trigger_restart_framework stop surfaceflinger start surfaceflinger - # A/B update verifier that marks a successful boot. - exec_start update_verifier class_start main class_start late_start |