commit 9cd3c84dc147f79359863b112b594f8195519b14
author Nikita Ioffe <ioffe@google.com> Tue Apr 07 17:34:52 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 07 17:34:52 2020 +0000
tree c8144994fb4305bb68457202df877f67cb4d7e96
parent 74429fc121224a74d9bcb1ecba20f0998fbcfab8
parent bf66f433d6b43322dc73bc1160ce542a7705ce00

Merge "Manually unmount /data_mirror mounts in the right order"

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index adfdb7b..6564e8f 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -1063,6 +1063,12 @@
   start vold
   exec - system system -- /system/bin/vdc checkpoint resetCheckpoint
   exec - system system -- /system/bin/vdc checkpoint markBootAttempt
+  # Unmount /data_mirror mounts in the reverse order of corresponding mounts.
+  umount /data_mirror/data_ce/null/0
+  umount /data_mirror/data_ce/null
+  umount /data_mirror/data_de/null
+  umount /data_mirror/cur_profiles
+  umount /data_mirror
   remount_userdata
   start bootanim