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

Commit a8611c09 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

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

am: 81e08d4c

Change-Id: I31b0c419f36eb1019e8a981bd7a181c765d4a86f
parents 8cecb02a 81e08d4c

fs_mgr/fs_mgr_remount.cpp

+7 −0
Original line number Diff line number Diff line
@@ -340,6 +340,7 @@ int main(int argc, char* argv[]) { 
                blk_device = rentry.blk_device;

                break;

            }

            // Find overlayfs mount point?

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

                blk_device = rentry.blk_device;

                mount_point = "/system";
@@ -352,6 +353,12 @@ int main(int argc, char* argv[]) { 
        }

        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!

        if (::mount(blk_device.c_str(), mount_point.c_str(), entry.fs_type.c_str(), MS_REMOUNT,

                    nullptr) == 0) {