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

Merge "init.rc: fix (re)starting apexd on FDE devices" am: 4bb41c0ee4 am: b8cadd770f

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1684057

Change-Id: I85c2662682b4e8c9ecefe509b0ef0647b56cfb49
This commit is contained in:
Eric Biggers 2021-04-29 21:19:56 +00:00 • committed by Automerger Merge Worker
commit 294fa94e7a
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
rootdir/init.rc
View file

@ -685,6 +685,10 @@ on post-fs-data
exec - system system -- /system/bin/vdc keymaster earlyBootEnded exec - system system -- /system/bin/vdc keymaster earlyBootEnded
# /data/apex is now available. Start apexd to scan and activate APEXes. # /data/apex is now available. Start apexd to scan and activate APEXes.
#
# To handle userspace reboots as well as devices that use FDE, make sure
# that apexd is started cleanly here (set apexd.status="") and that it is
# restarted if it's already running.
mkdir /data/apex 0755 root system encryption=None mkdir /data/apex 0755 root system encryption=None
mkdir /data/apex/active 0755 root system mkdir /data/apex/active 0755 root system
mkdir /data/apex/backup 0700 root system mkdir /data/apex/backup 0700 root system
@ -693,7 +697,8 @@ on post-fs-data
mkdir /data/apex/sessions 0700 root system mkdir /data/apex/sessions 0700 root system
mkdir /data/app-staging 0751 system system encryption=DeleteIfNecessary mkdir /data/app-staging 0751 system system encryption=DeleteIfNecessary
mkdir /data/apex/ota_reserved 0700 root system encryption=Require mkdir /data/apex/ota_reserved 0700 root system encryption=Require
start apexd setprop apexd.status ""
restart apexd
# create rest of basic filesystem structure # create rest of basic filesystem structure
mkdir /data/misc/recovery 0770 system log mkdir /data/misc/recovery 0770 system log
@ -1240,7 +1245,6 @@ on userspace-reboot-requested
setprop dev.bootcomplete "" setprop dev.bootcomplete ""
setprop sys.init.updatable_crashing "" setprop sys.init.updatable_crashing ""
setprop sys.init.updatable_crashing_process_name "" setprop sys.init.updatable_crashing_process_name ""
setprop apexd.status ""
setprop sys.user.0.ce_available "" setprop sys.user.0.ce_available ""
setprop sys.shutdown.requested "" setprop sys.shutdown.requested ""
setprop service.bootanim.exit "" setprop service.bootanim.exit ""