summaryrefslogtreecommitdiff
path: root/cppreopts
diff options
context:
space:
mode:
authorYifan Hong <elsk@google.com>2019-04-09 11:53:00 -0700
committerYifan Hong <elsk@google.com>2019-04-16 17:02:41 +0000
commit94a8a8c5f247c281e2130d9353e8ac9b4fb2c300 (patch)
tree17848f5c4f02c846fd6b53218c56be6a739c1ce0 /cppreopts
parent7ed6aabda897ac6cc0baa7ae28db8a680acc91e0 (diff)
downloadextras-94a8a8c5f247c281e2130d9353e8ac9b4fb2c300.tar.gz
cppreopts: umount_all fstab.postinstall
- Change 'umount /postinstall' to a full umount_all so that postinstall-verity device get destroyed. - No longer set sys.cppreopt=mounted because that incurs even more code. Just duplicate the two procedures. Test: flash, boot, then check `dmctl list devices`, then OTA Fixes: 129988285 Change-Id: Ic0cdf55b3639632dc5f2659c8bf36b8c3deea92d Merged-In: Ic0cdf55b3639632dc5f2659c8bf36b8c3deea92d
Diffstat (limited to 'cppreopts')
-rw-r--r--cppreopts/cppreopts.rc11
1 files changed, 6 insertions, 5 deletions
diff --git a/cppreopts/cppreopts.rc b/cppreopts/cppreopts.rc
index 60bd66ca..a7f69445 100644
--- a/cppreopts/cppreopts.rc
+++ b/cppreopts/cppreopts.rc
@@ -25,15 +25,16 @@ service cppreopts /system/bin/cppreopts.sh /postinstall
# /system. Therefore, the fstab can only be in either /system or /product.
on property:sys.cppreopt=requested && property:ro.postinstall.fstab.prefix=/system
mount_all /system/etc/fstab.postinstall
- setprop sys.cppreopt mounted
+ exec_start cppreopts
+ # Optional script to copy additional preloaded content to data directory
+ exec - system system -- /system/bin/preloads_copy.sh /postinstall
+ umount_all /system/etc/fstab.postinstall
+ setprop sys.cppreopt finished
on property:sys.cppreopt=requested && property:ro.postinstall.fstab.prefix=/product
mount_all /product/etc/fstab.postinstall
- setprop sys.cppreopt mounted
-
-on property:sys.cppreopt=mounted
exec_start cppreopts
# Optional script to copy additional preloaded content to data directory
exec - system system -- /system/bin/preloads_copy.sh /postinstall
- umount /postinstall
+ umount_all /product/etc/fstab.postinstall
setprop sys.cppreopt finished