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

Commit 4744dd7a authored by Martijn Coenen's avatar Martijn Coenen Committed by Automerger Merge Worker
Browse files

Merge "Add on-device signing binary." am: 73dea057 am: f14403b8 am: 7475a24c

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1513029

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia445af69af56c6707d9d7c7ddfa64b3a42f0a3d7
parents d633c70d 7475a24c
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -738,6 +738,8 @@ on post-fs-data
    mkdir /data/misc/snapshotctl_log 0755 root root
    # create location to store pre-reboot information
    mkdir /data/misc/prereboot 0700 system system
    # directory used for on-device signing key blob
    mkdir /data/misc/odsign 0700 root root

    mkdir /data/preloads 0775 system system encryption=None

@@ -877,6 +879,10 @@ on post-fs-data
    # Set SELinux security contexts on upgrade or policy update.
    restorecon --recursive --skip-ce /data

    # Start the on-device signing daemon, and wait for it to finish, to ensure
    # ART artifacts are generated if needed.
    exec_start odsign

    # After apexes are mounted, tell keymaster early boot has ended, so it will
    # stop allowing use of early-boot keys
    exec - system system -- /system/bin/vdc keymaster earlyBootEnded