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

Commit 61b20168 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Move tzdatacheck execution after apex is mounted"

parents ef3429da ada7e492

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.