commit 4007b8145a429caf5c3b4be9cd024bec8dd59ae5
author Wei Wang <wvw@google.com> Tue Jul 25 20:44:21 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jul 25 20:44:21 2017 +0000
tree aa58741246ebccffd8349bc3a4cce9a93404d306
parent b0075b8caf68bc5a5a5e0cf3b3e192f24d9ff2dd
parent 27d8f7b799fd043fc12c4ebc00c81fecfea0472a

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

Change-Id: I84024bff22fee8569c0f1193d6f3d8417d3cbc1b

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