Do not umount roofs even if it is R/W.
Latest device has rootfs instead of "/system" mount point
(cherry picked from commit a01c27eef8e9361df63a62c916619fb809bc647b)
Bug: 37737296
Test: adb remount, reboot, and check log
Change-Id: I315ecf71e85255fc55c3a80619920b456bad0956
diff --git a/init/reboot.cpp b/init/reboot.cpp
index 0a04890..cee5a72 100644
--- a/init/reboot.cpp
+++ b/init/reboot.cpp
@@ -201,7 +201,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)) {