commit 27d8f7b799fd043fc12c4ebc00c81fecfea0472a
author Wei Wang <wvw@google.com> Tue Jul 25 20:41:19 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jul 25 20:41:19 2017 +0000
tree a23e4da683b9f3ff40eb210abe6cbb9179312e90
parent d67a62345803336619b4f0de7de2dadc55b1f004
parent 344f3f03e5e251a2f44733d85105dfba9f67e3d3

Merge "Do not umount roofs even if it is R/W."
am: 43567e39dc

Change-Id: I89bfb662469c28559eb628e48aee1ecb262ad2ee

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)) {