Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fac2b18f authored by Eric Biggers's avatar Eric Biggers
Browse files

init.rc: merge the zygote-start actions 

The three actions for "zygote-start" are identical except for their
property triggers.  This seems to have been left over from when Android
supported both File Based Encryption (FBE) and Full Disk Encryption
(FDE), causing there to be four possible encryption states:

- ro.crypto.state=unsupported (No encryption configured)
- ro.crypto.state=encrypted && ro.crypto.type=file (FBE enabled)
- ro.crypto.state=unencrypted (FDE supported but disabled)
- ro.crypto.state=encrypted && ro.crypto.type=block (FDE enabled)

It seems that the reason the zygote-start action was duplicated three
times was to exclude the "FDE enabled" case, which could only be done by
explicitly listing the other three cases.

However, now that FDE is no longer supported, only the first two cases
are possible.  Therefore, zygote-start can just be the whole trigger.

Bug: 208476087
Test: presubmit
Change-Id: Icd6e4b0d2fb3f9f20595c0af4e2e35350564da8d
parent 9b567001

rootdir/init.rc

+2 −20
Original line number Diff line number Diff line
@@ -533,7 +533,7 @@ on late-init 
    # Should be before netd, but after apex, properties and logging is available.

    trigger load_bpf_programs



    # Now we can start zygote for devices with file based encryption

    # Now we can start zygote.

    trigger zygote-start



    # Remove a file to wake up anything waiting for firmware.
@@ -1056,25 +1056,7 @@ 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

    wait_for_prop odsign.verification.done 1

    # A/B update verifier that marks a successful boot.

    exec_start update_verifier_nonencrypted

    start statsd

    start netd

    start zygote

    start zygote_secondary



on zygote-start && property:ro.crypto.state=unsupported

    wait_for_prop odsign.verification.done 1

    # A/B update verifier that marks a successful boot.

    exec_start update_verifier_nonencrypted

    start statsd

    start netd

    start zygote

    start zygote_secondary



on zygote-start && property:ro.crypto.state=encrypted && property:ro.crypto.type=file

on zygote-start

    wait_for_prop odsign.verification.done 1

    # A/B update verifier that marks a successful boot.

    exec_start update_verifier_nonencrypted