openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

am: 081c1921e0

Change-Id: I0e7da9de55bd7f8b39561aa0a3a9a8b434749ddb
This commit is contained in:
Wei Wang 2017-07-25 20:51:18 +00:00 committed by android-build-merger
parent c2548ea392 081c1921e0
commit 4cca10cf7e
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

@ -237,7 +237,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)) {