ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
am: 3305192d3a

Change-Id: Ibd10e2778c66dd7a4ff3d1139f5a783405d73941
This commit is contained in:
Neil Fuller 2019-02-25 23:02:41 -08:00 • committed by android-build-merger
commit 6916a8fc05
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
rootdir/init.rc
View file

@ -577,9 +577,6 @@ on post-fs-data
# Set SELinux security contexts on upgrade or policy update. # Set SELinux security contexts on upgrade or policy update.
restorecon --recursive --skip-ce /data 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 # load fsverity keys
exec -- /system/bin/mini-keyctl -c /product/etc/security/cacerts_fsverity,/vendor/etc/security/cacerts_fsverity -k .fs-verity 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 setup_runtime_bionic
parse_apex_configs 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 # If there is no post-fs-data action in the init.<device>.rc file, you
# must uncomment this line, otherwise encrypted filesystems # must uncomment this line, otherwise encrypted filesystems
# won't work. # won't work.