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

Commit e0877535 authored by Yi-yo Chiang's avatar Yi-yo Chiang Committed by Gerrit Code Review
Browse files

Merge "overlayfs: fs_mgr_overlayfs_setup() should accept Fstab as input"

parents acac60d5 e508ac4f

fs_mgr/fs_mgr_overlayfs.cpp

+2 −7
Original line number Diff line number Diff line
@@ -1351,7 +1351,8 @@ bool fs_mgr_overlayfs_mount_all(Fstab* fstab) { 
    return ret;

}



bool fs_mgr_overlayfs_setup(const char* mount_point, bool* want_reboot, bool just_disabled_verity) {

bool fs_mgr_overlayfs_setup(const Fstab& fstab, const char* mount_point, bool* want_reboot,

                            bool just_disabled_verity) {

    if (!OverlayfsSetupAllowed(/*verbose=*/true)) {

        return false;

    }
@@ -1361,12 +1362,6 @@ bool fs_mgr_overlayfs_setup(const char* mount_point, bool* want_reboot, bool jus 
        return false;

    }



    Fstab fstab;

    if (!ReadDefaultFstab(&fstab)) {

        LOG(ERROR) << "Could not read fstab";

        return false;

    }



    auto candidates = fs_mgr_overlayfs_candidate_list(fstab);

    for (auto it = candidates.begin(); it != candidates.end();) {

        if (mount_point &&

fs_mgr/fs_mgr_priv_overlayfs.h

+2 −2
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ android::fs_mgr::Fstab fs_mgr_overlayfs_candidate_list(const android::fs_mgr::Fs 
//

// If |want_reboot| is non-null, and a reboot is needed to apply overlays, then

// it will be true on return. The caller is responsible for initializing it.

bool fs_mgr_overlayfs_setup(const char* mount_point = nullptr, bool* want_reboot = nullptr,

                            bool just_disabled_verity = true);

bool fs_mgr_overlayfs_setup(const android::fs_mgr::Fstab& fstab, const char* mount_point = nullptr,

                            bool* want_reboot = nullptr, bool just_disabled_verity = true);



enum class OverlayfsTeardownResult {

    Ok,

fs_mgr/fs_mgr_remount.cpp

+7 −2
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ bool CheckOverlayfs(Fstab* partitions, RemountCheckResult* result) { 
        if (fs_mgr_wants_overlayfs(&entry)) {

            bool want_reboot = false;

            bool force = result->disabled_verity;

            if (!fs_mgr_overlayfs_setup(mount_point.c_str(), &want_reboot, force)) {

            if (!fs_mgr_overlayfs_setup(*partitions, mount_point.c_str(), &want_reboot, force)) {

                LOG(ERROR) << "Overlayfs setup for " << mount_point << " failed, skipping";

                ok = false;

                it = partitions->erase(it);
@@ -442,7 +442,12 @@ SetVerityStateResult SetVerityState(bool enable_verity) { 
bool SetupOrTeardownOverlayfs(bool enable) {

    bool want_reboot = false;

    if (enable) {

        if (!fs_mgr_overlayfs_setup(nullptr, &want_reboot)) {

        Fstab fstab;

        if (!ReadDefaultFstab(&fstab)) {

            LOG(ERROR) << "Could not read fstab.";

            return want_reboot;

        }

        if (!fs_mgr_overlayfs_setup(fstab, nullptr, &want_reboot)) {

            LOG(ERROR) << "Overlayfs setup failed.";

            return want_reboot;

        }