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

Commit ada7e492 authored by Neil Fuller's avatar Neil Fuller
Browse files

Move tzdatacheck execution after apex is mounted 

tzdatacheck references files in the runtime apex so should
not be executed before the apex mounts are ready.

Test: Manual tests (see b/123270813); observed tzdatacheck running after
      apex files are mounted
Bug: 123270813
Bug: 116191025
Bug: 119293618
Bug: 113373927
Change-Id: I249d127c1d568bc5025d81b0bb4187c81363d897
parent af0c58f1

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.