Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ad7b3cb authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

Try to remount mounted points only 



If we don't mount a certain partition intentionally, should be okay to bypass
remounting the partition.

Bug: 180435772
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@google.com>
Change-Id: I7e4d420693f8ba35ec7881d39d0ca682688743c5
parent cd101cd7

fs_mgr/fs_mgr_remount.cpp

+7 −0
Original line number Diff line number Diff line
@@ -411,19 +411,26 @@ static int do_remount(int argc, char* argv[]) { 
        auto blk_device = entry.blk_device;

        auto mount_point = entry.mount_point;



        auto found = false;

        for (auto it = mounts.rbegin(); it != mounts.rend(); ++it) {

            auto& rentry = *it;

            if (mount_point == rentry.mount_point) {

                blk_device = rentry.blk_device;

                found = true;

                break;

            }

            // Find overlayfs mount point?

            if ((mount_point == "/") && (rentry.mount_point == "/system")) {

                blk_device = rentry.blk_device;

                mount_point = "/system";

                found = true;

                break;

            }

        }

        if (!found) {

            PLOG(INFO) << "skip unmounted partition dev:" << blk_device << " mnt:" << mount_point;

            continue;

        }

        if (blk_device == "/dev/root") {

            auto from_fstab = GetEntryForMountPoint(&fstab, mount_point);

            if (from_fstab) blk_device = from_fstab->blk_device;