From ada7e4928a2a68993f6849a62467cb4684825adb Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Fri, 22 Feb 2019 14:05:40 +0000 Subject: [PATCH] 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 --- rootdir/init.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rootdir/init.rc b/rootdir/init.rc index 57032bc2e..196ef6a7c 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -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..rc file, you # must uncomment this line, otherwise encrypted filesystems # won't work.