summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Wang2017-07-25 16:34:50 -0500
committerandroid-build-merger2017-07-25 16:34:50 -0500
commitba6705f9de256ac5a95ef488f39b89d42ccf62b0 (patch)
tree214d29a1487aed2104cb5b0a676702c6983cb213
parent385a5dc03adbf780f5b4f3d1a0038c4036b24577 (diff)
parentb7a8764a1250237dec49c6c3d6db4ef88f5f2978 (diff)
downloadplatform-system-core-ba6705f9de256ac5a95ef488f39b89d42ccf62b0.tar.gz
platform-system-core-ba6705f9de256ac5a95ef488f39b89d42ccf62b0.tar.xz
platform-system-core-ba6705f9de256ac5a95ef488f39b89d42ccf62b0.zip
Do not umount roofs even if it is R/W.
am: b7a8764a12 Change-Id: I56014ac0ae01a5666a58225eed5f89e08859c0d8
-rw-r--r--init/reboot.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/init/reboot.cpp b/init/reboot.cpp
index e4779c7e2..17e3576a7 100644
--- a/init/reboot.cpp
+++ b/init/reboot.cpp
@@ -237,7 +237,8 @@ static bool FindPartitionsToUmount(std::vector<MountEntry>* blockDevPartitions,
237 std::string mount_dir(mentry->mnt_dir); 237 std::string mount_dir(mentry->mnt_dir);
238 // These are R/O partitions changed to R/W after adb remount. 238 // These are R/O partitions changed to R/W after adb remount.
239 // Do not umount them as shutdown critical services may rely on them. 239 // Do not umount them as shutdown critical services may rely on them.
240 if (mount_dir != "/system" && mount_dir != "/vendor" && mount_dir != "/oem") { 240 if (mount_dir != "/" && mount_dir != "/system" && mount_dir != "/vendor" &&
241 mount_dir != "/oem") {
241 blockDevPartitions->emplace(blockDevPartitions->begin(), *mentry); 242 blockDevPartitions->emplace(blockDevPartitions->begin(), *mentry);
242 } 243 }
243 } else if (MountEntry::IsEmulatedDevice(*mentry)) { 244 } else if (MountEntry::IsEmulatedDevice(*mentry)) {