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

Merge "fs_mgr: remount: system is root" am: 2b8e96bd64

Browse source 
am: 81e08d4c98

Change-Id: I31b0c419f36eb1019e8a981bd7a181c765d4a86f
This commit is contained in:
Mark Salyzyn 2019-04-02 15:25:04 -07:00 • committed by android-build-merger
commit a8611c0982
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
fs_mgr/fs_mgr_remount.cpp
View file

@ -340,6 +340,7 @@ int main(int argc, char* argv[]) {
blk_device = rentry.blk_device; blk_device = rentry.blk_device;
break; break;
} }
// Find overlayfs mount point?
if ((mount_point == "/") && (rentry.mount_point == "/system")) { if ((mount_point == "/") && (rentry.mount_point == "/system")) {
blk_device = rentry.blk_device; blk_device = rentry.blk_device;
mount_point = "/system"; mount_point = "/system";
@ -352,6 +353,12 @@ int main(int argc, char* argv[]) {
} }
fs_mgr_set_blk_ro(blk_device, false); fs_mgr_set_blk_ro(blk_device, false);
// Find system-as-root mount point?
if ((mount_point == "/system") && !GetEntryForMountPoint(&mounts, mount_point) &&
GetEntryForMountPoint(&mounts, "/")) {
mount_point = "/";
}
// Now remount! // Now remount!
if (::mount(blk_device.c_str(), mount_point.c_str(), entry.fs_type.c_str(), MS_REMOUNT, if (::mount(blk_device.c_str(), mount_point.c_str(), entry.fs_type.c_str(), MS_REMOUNT,
nullptr) == 0) { nullptr) == 0) {