ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not umount roofs even if it is R/W.

Browse source 
Latest device has rootfs instead of "/system" mount point

(cherry picked from commit a01c27eef8)

Bug: 37737296
Test: adb remount, reboot, and check log
Change-Id: I315ecf71e85255fc55c3a80619920b456bad0956
This commit is contained in:
Wei Wang 2017-07-25 10:52:08 -07:00
parent 53ce94588b
commit b7a8764a12
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
init/reboot.cpp
View file

@ -201,7 +201,8 @@ static bool FindPartitionsToUmount(std::vector<MountEntry>* blockDevPartitions,
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)) {