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

Commit 082b5271 authored by Martin Stjernholm's avatar Martin Stjernholm Committed by Automerger Merge Worker
Browse files

Merge "Try erofs when mounting OTA partitions." am: 0b6974be am: 699fa040 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2469753



Change-Id: I4238b088e411e4fc7473128eb6104f0e782dc96e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cb861cc1 699fa040

cmds/installd/otapreopt_chroot.cpp

+27 −12
Original line number Original line Diff line number Diff line
@@ -45,6 +45,10 @@ using android::base::StringPrintf; 
namespace android {

namespace android {

namespace installd {

namespace installd {





// We don't know the filesystem types of the partitions in the update package,

// so just try the possibilities one by one.

static constexpr std::array kTryMountFsTypes = {"ext4", "erofs"};



static void CloseDescriptor(int fd) {

static void CloseDescriptor(int fd) {

    if (fd >= 0) {

    if (fd >= 0) {

        int result = close(fd);

        int result = close(fd);
@@ -82,6 +86,27 @@ static void DeactivateApexPackages() { 
    }

    }

}

}





static bool TryMountWithFstypes(const char* block_device, const char* target) {

    for (int i = 0; i < kTryMountFsTypes.size(); ++i) {

        const char* fstype = kTryMountFsTypes[i];

        int mount_result = mount(block_device, target, fstype, MS_RDONLY, /* data */ nullptr);

        if (mount_result == 0) {

            return true;

        }

        if (errno == EINVAL && i < kTryMountFsTypes.size() - 1) {

            // Only try the next fstype if mounting failed due to the current one

            // being invalid.

            LOG(WARNING) << "Failed to mount " << block_device << " on " << target << " with "

                         << fstype << " - trying " << kTryMountFsTypes[i + 1];

        } else {

            PLOG(ERROR) << "Failed to mount " << block_device << " on " << target << " with "

                        << fstype;

            return false;

        }

    }

    __builtin_unreachable();

}



static void TryExtraMount(const char* name, const char* slot, const char* target) {

static void TryExtraMount(const char* name, const char* slot, const char* target) {

    std::string partition_name = StringPrintf("%s%s", name, slot);

    std::string partition_name = StringPrintf("%s%s", name, slot);
@@ -91,12 +116,7 @@ static void TryExtraMount(const char* name, const char* slot, const char* target 
        if (dm.GetState(partition_name) != dm::DmDeviceState::INVALID) {

        if (dm.GetState(partition_name) != dm::DmDeviceState::INVALID) {

            std::string path;

            std::string path;

            if (dm.GetDmDevicePathByName(partition_name, &path)) {

            if (dm.GetDmDevicePathByName(partition_name, &path)) {

                int mount_result = mount(path.c_str(),

                if (TryMountWithFstypes(path.c_str(), target)) {

                                         target,

                                         "ext4",

                                         MS_RDONLY,

                                         /* data */ nullptr);

                if (mount_result == 0) {

                    return;

                    return;

                }

                }

            }

            }
@@ -105,12 +125,7 @@ static void TryExtraMount(const char* name, const char* slot, const char* target 




    // Fall back and attempt a direct mount.

    // Fall back and attempt a direct mount.

    std::string block_device = StringPrintf("/dev/block/by-name/%s", partition_name.c_str());

    std::string block_device = StringPrintf("/dev/block/by-name/%s", partition_name.c_str());

    int mount_result = mount(block_device.c_str(),

    (void)TryMountWithFstypes(block_device.c_str(), target);

                             target,

                             "ext4",

                             MS_RDONLY,

                             /* data */ nullptr);

    UNUSED(mount_result);

}

}





// Entry for otapreopt_chroot. Expected parameters are:

// Entry for otapreopt_chroot. Expected parameters are: