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

Commit b7a8764a authored by Wei Wang's avatar Wei Wang
Browse files

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

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

(cherry picked from commit a01c27ee)

Bug: 37737296
Test: adb remount, reboot, and check log
Change-Id: I315ecf71e85255fc55c3a80619920b456bad0956
parent 53ce9458

init/reboot.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -201,7 +201,8 @@ static bool FindPartitionsToUmount(std::vector<MountEntry>* blockDevPartitions, 
            std::string mount_dir(mentry->mnt_dir);

            std::string mount_dir(mentry->mnt_dir);

            // These are R/O partitions changed to R/W after adb remount.

            // These are R/O partitions changed to R/W after adb remount.

            // Do not umount them as shutdown critical services may rely on them.

            // 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);

                blockDevPartitions->emplace(blockDevPartitions->begin(), *mentry);

            }

            }

        } else if (MountEntry::IsEmulatedDevice(*mentry)) {

        } else if (MountEntry::IsEmulatedDevice(*mentry)) {