From c4a524b1d7a3ea0e2a51ae54f3dc7edb44afea24 Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Wed, 9 Aug 2017 14:54:56 -0700 Subject: [PATCH 1/2] bootstat: switch from root.root to system.log (cherry picked from commit c3ad75be840c1f4bec5c1638da445122fc3062b1) bootstat does not need root uid and root gid permissions to perform its tasks. It appears that system uid and log gid are adequate and appropriate. Test: manual Bug: 63736262 Bug: 65843095 Change-Id: I094c2cb054e441562fa8717a4d3dc0086fb70a7a --- bootstat/bootstat.rc | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/bootstat/bootstat.rc b/bootstat/bootstat.rc index f4756d59d..d697efba0 100644 --- a/bootstat/bootstat.rc +++ b/bootstat/bootstat.rc @@ -1,7 +1,39 @@ # This file is the LOCAL_INIT_RC file for the bootstat command. on post-fs-data - mkdir /data/misc/bootstat 0700 root root + mkdir /data/misc/bootstat 0700 system log + # To deal with ota transition resulting from a change in DAC from + # root.root to system.log, may be deleted after ota has settled. + chown system log /data/misc/bootstat/absolute_boot_time + chown system log /data/misc/bootstat/boot_complete + chown system log /data/misc/bootstat/boot_complete_no_encryption + chown system log /data/misc/bootstat/boot_reason + chown system log /data/misc/bootstat/bootime.bootloader.1BLE + chown system log /data/misc/bootstat/bootime.bootloader.1BLL + chown system log /data/misc/bootstat/bootime.bootloader.2BLE + chown system log /data/misc/bootstat/bootime.bootloader.2BLL + chown system log /data/misc/bootstat/bootime.bootloader.AVB + chown system log /data/misc/bootstat/bootime.bootloader.KD + chown system log /data/misc/bootstat/bootime.bootloader.KL + chown system log /data/misc/bootstat/bootime.bootloader.ODT + chown system log /data/misc/bootstat/bootime.bootloader.SW + chown system log /data/misc/bootstat/bootime.bootloader.total + chown system log /data/misc/bootstat/build_date + chown system log /data/misc/bootstat/factory_reset + chown system log /data/misc/bootstat/factory_reset_boot_complete + chown system log /data/misc/bootstat/factory_reset_boot_complete_no_encryption + chown system log /data/misc/bootstat/factory_reset_current_time + chown system log /data/misc/bootstat/factory_reset_record_value + chown system log /data/misc/bootstat/last_boot_time_utc + chown system log /data/misc/bootstat/ota_boot_complete + chown system log /data/misc/bootstat/ota_boot_complete_no_encryption + chown system log /data/misc/bootstat/post_decrypt_time_elapsed + chown system log /data/misc/bootstat/ro.boottime.init + chown system log /data/misc/bootstat/ro.boottime.init.cold_boot_wait + chown system log /data/misc/bootstat/ro.boottime.init.selinux + chown system log /data/misc/bootstat/time_since_factory_reset + chown system log /data/misc/bootstat/time_since_last_boot + # end ota transitional support # Record the time at which the user has successfully entered the pin to decrypt # the device, /data is decrypted, and the system is entering the main boot phase. @@ -10,7 +42,7 @@ on post-fs-data # property:init.svc.bootanim=running: The boot animation is running # property:ro.crypto.type=block: FDE device on post-fs-data && property:init.svc.bootanim=running && property:ro.crypto.type=block - exec - root root -- /system/bin/bootstat -r post_decrypt_time_elapsed + exec - system log -- /system/bin/bootstat -r post_decrypt_time_elapsed # sys.logbootcomplete is a signal to enable the bootstat logging mechanism. # This signaling is necessary to prevent logging boot metrics after a runtime @@ -33,13 +65,13 @@ on property:init.svc.zygote=stopping # Record boot complete metrics. on property:sys.boot_completed=1 && property:sys.logbootcomplete=1 # Record boot_complete and related stats (decryption, etc). - exec - root root -- /system/bin/bootstat --record_boot_complete + exec - system log -- /system/bin/bootstat --record_boot_complete # Record the boot reason. - exec - root root -- /system/bin/bootstat --record_boot_reason + exec - system log -- /system/bin/bootstat --record_boot_reason # Record time since factory reset. - exec - root root -- /system/bin/bootstat --record_time_since_factory_reset + exec - system log -- /system/bin/bootstat --record_time_since_factory_reset # Log all boot events. - exec - root root -- /system/bin/bootstat -l + exec - system log -- /system/bin/bootstat -l From 594ce46f642668ac0a78bdd48561cb1939894e55 Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Mon, 18 Sep 2017 10:27:01 -0700 Subject: [PATCH 2/2] bootstat: bootloader stat files misspelled (cherry picked form commit 25246ddfe6aa0d92c68ad450e206887147f766b4) Test: system/core/bootstat/boot_reason_test.sh Bug: 63736262 Bug: 65843095 Change-Id: I6620c9965f4af8b6a3829f1f4cdcc9b691471a71 --- bootstat/bootstat.rc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/bootstat/bootstat.rc b/bootstat/bootstat.rc index d697efba0..2c48faed4 100644 --- a/bootstat/bootstat.rc +++ b/bootstat/bootstat.rc @@ -8,16 +8,16 @@ on post-fs-data chown system log /data/misc/bootstat/boot_complete chown system log /data/misc/bootstat/boot_complete_no_encryption chown system log /data/misc/bootstat/boot_reason - chown system log /data/misc/bootstat/bootime.bootloader.1BLE - chown system log /data/misc/bootstat/bootime.bootloader.1BLL - chown system log /data/misc/bootstat/bootime.bootloader.2BLE - chown system log /data/misc/bootstat/bootime.bootloader.2BLL - chown system log /data/misc/bootstat/bootime.bootloader.AVB - chown system log /data/misc/bootstat/bootime.bootloader.KD - chown system log /data/misc/bootstat/bootime.bootloader.KL - chown system log /data/misc/bootstat/bootime.bootloader.ODT - chown system log /data/misc/bootstat/bootime.bootloader.SW - chown system log /data/misc/bootstat/bootime.bootloader.total + chown system log /data/misc/bootstat/boottime.bootloader.1BLE + chown system log /data/misc/bootstat/boottime.bootloader.1BLL + chown system log /data/misc/bootstat/boottime.bootloader.2BLE + chown system log /data/misc/bootstat/boottime.bootloader.2BLL + chown system log /data/misc/bootstat/boottime.bootloader.AVB + chown system log /data/misc/bootstat/boottime.bootloader.KD + chown system log /data/misc/bootstat/boottime.bootloader.KL + chown system log /data/misc/bootstat/boottime.bootloader.ODT + chown system log /data/misc/bootstat/boottime.bootloader.SW + chown system log /data/misc/bootstat/boottime.bootloader.total chown system log /data/misc/bootstat/build_date chown system log /data/misc/bootstat/factory_reset chown system log /data/misc/bootstat/factory_reset_boot_complete