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

Commit 6916a8fc authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

Merge "Move tzdatacheck execution after apex is mounted" am: 61b20168 

am: 3305192d

Change-Id: Ibd10e2778c66dd7a4ff3d1139f5a783405d73941
parents 677552f1 3305192d

rootdir/init.rc

+3 −3
Original line number Diff line number Diff line
@@ -577,9 +577,6 @@ on post-fs-data 
    # Set SELinux security contexts on upgrade or policy update.

    restorecon --recursive --skip-ce /data



    # Check any timezone data in /data is newer than the copy in the runtime module, delete if not.

    exec - system system -- /system/bin/tzdatacheck /apex/com.android.runtime/etc/tz /data/misc/zoneinfo



    # load fsverity keys

    exec -- /system/bin/mini-keyctl -c /product/etc/security/cacerts_fsverity,/vendor/etc/security/cacerts_fsverity -k .fs-verity
@@ -591,6 +588,9 @@ on post-fs-data 
    setup_runtime_bionic

    parse_apex_configs



    # Check any timezone data in /data is newer than the copy in the runtime module, delete if not.

    exec - system system -- /system/bin/tzdatacheck /apex/com.android.runtime/etc/tz /data/misc/zoneinfo



    # If there is no post-fs-data action in the init.<device>.rc file, you

    # must uncomment this line, otherwise encrypted filesystems

    # won't work.