commit 11649e8925a4f6b0876852c812d7adfc0f502c50
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jul 18 03:08:42 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 18 03:08:42 2017 +0000
tree 8802c4d329f1446f7512a0cd0bcd197aaeeb0e4b
parent e03665142ed10965046dd21d315a5ccbc2cbb717
parent 6e12b3887e2b964124ab1ba73f84f8049f932df7

Merge "Do not umount /vendor, /system, and /oem even if they are R/W."

init/reboot.cpp

diff --git a/init/reboot.cpp b/init/reboot.cpp
index 969caec..8196d58 100644
--- a/init/reboot.cpp
+++ b/init/reboot.cpp
@@ -234,7 +234,12 @@
             LOG(INFO) << "mount entry " << mentry->mnt_fsname << ":" << mentry->mnt_dir << " opts "
                       << mentry->mnt_opts << " type " << mentry->mnt_type;
         } else if (MountEntry::IsBlockDevice(*mentry) && hasmntopt(mentry, "rw")) {
-            blockDevPartitions->emplace(blockDevPartitions->begin(), *mentry);
+            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") {
+                blockDevPartitions->emplace(blockDevPartitions->begin(), *mentry);
+            }
         } else if (MountEntry::IsEmulatedDevice(*mentry)) {
             emulatedPartitions->emplace(emulatedPartitions->begin(), *mentry);
         }