diff options
| author | Yifan Hong <elsk@google.com> | 2019-04-09 11:53:00 -0700 |
|---|---|---|
| committer | Yifan Hong <elsk@google.com> | 2019-04-09 13:06:48 -0700 |
| commit | 6acf718cc807f09e48637642a84b8951a55b2bb7 (patch) | |
| tree | 3d512f21d19695ec5513f1af5fbf1b246ba24879 | |
| parent | 70179fc3c4ec0d9858f04e829f4aead709a77b98 (diff) | |
| download | extras-6acf718cc807f09e48637642a84b8951a55b2bb7.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
| -rw-r--r-- | cppreopts/cppreopts.rc | 11 |
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 |