commit f99a30d5ef0aaf8495eada15d9d852a8f4eb461f
author Wei Wang <wvw@google.com> Tue Jul 25 20:51:18 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jul 25 20:51:18 2017 +0000
tree 39beb716a1ea15c5c31b29d9ca06e0b672465376
parent 59c529710b59fa75087d685d40d75c19e57483f2
parent 31638847ed60a7b3bb4d51e7fd0c2f3944b3af83

Merge "Do not umount roofs even if it is R/W." am: 43567e39dc am: 22782a7269 am: 34e13498dc
am: 081c1921e0

Change-Id: I0e7da9de55bd7f8b39561aa0a3a9a8b434749ddb

init/reboot.cpp

diff --git a/init/reboot.cpp b/init/reboot.cpp
index e4779c7..17e3576 100644
--- a/init/reboot.cpp
+++ b/init/reboot.cpp
@@ -237,7 +237,8 @@
             std::string mount_dir(mentry->mnt_dir);
             // These are R/O partitions changed to R/W after adb remount.
             // Do not umount them as shutdown critical services may rely on them.
-            if (mount_dir != "/system" && mount_dir != "/vendor" && mount_dir != "/oem") {
+            if (mount_dir != "/" && mount_dir != "/system" && mount_dir != "/vendor" &&
+                mount_dir != "/oem") {
                 blockDevPartitions->emplace(blockDevPartitions->begin(), *mentry);
             }
         } else if (MountEntry::IsEmulatedDevice(*mentry)) {