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

Commit 691fb0c0 authored by David Anderson's avatar David Anderson Committed by Automerger Merge Worker
Browse files

Merge "Support multiple fstab configs for one mount point" am: 9784f5ae am:... 

Merge "Support multiple fstab configs for one mount point" am: 9784f5ae am: 5db145c2 am: b38966fb

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1788172

Change-Id: I8cdffe5cb3348eb865ddc1d75eafaf6aff2f4626
parents 21027ddf b38966fb

fs_mgr/fs_mgr_roots.cpp

+33 −14
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
 * limitations under the License.

 */



#include "android-base/file.h"

#include "fs_mgr/roots.h"



#include <sys/mount.h>
@@ -39,18 +40,26 @@ FstabEntry* GetEntryForPath(Fstab* fstab, const std::string& path) { 
    while (true) {

        auto entry = GetEntryForMountPoint(fstab, str);

        if (entry != nullptr) return entry;

        if (str == "/") break;

        auto slash = str.find_last_of('/');

        if (slash == std::string::npos) break;

        if (slash == 0) {

            str = "/";

        } else {

            str = str.substr(0, slash);

        }

        str = android::base::Dirname(str);

        if (!str.compare(".") || !str.compare("/")) break;

    }

    return nullptr;

}



std::vector<FstabEntry*> GetEntriesForPath(Fstab* fstab, const std::string& path) {

    std::vector<FstabEntry*> entries;

    if (path.empty()) return entries;



    std::string str(path);

    while (true) {

        entries = GetEntriesForMountPoint(fstab, str);

        if (!entries.empty()) return entries;

        str = android::base::Dirname(str);

        if (!str.compare(".") || !str.compare("/")) break;

    }

    return entries;

}



enum class MountState {

    ERROR = -1,

    NOT_MOUNTED = 0,
@@ -71,12 +80,7 @@ static MountState GetMountState(const std::string& mount_point) { 
    return MountState::NOT_MOUNTED;

}



bool EnsurePathMounted(Fstab* fstab, const std::string& path, const std::string& mount_pt) {

    auto rec = GetEntryForPath(fstab, path);

    if (rec == nullptr) {

        LERROR << "unknown volume for path [" << path << "]";

        return false;

    }

bool TryPathMount(FstabEntry* rec, const std::string& mount_pt) {

    if (rec->fs_type == "ramdisk") {

        // The ramdisk is always mounted.

        return true;
@@ -136,6 +140,21 @@ bool EnsurePathMounted(Fstab* fstab, const std::string& path, const std::string& 
    return true;

}



bool EnsurePathMounted(Fstab* fstab, const std::string& path, const std::string& mount_point) {

    auto entries = GetEntriesForPath(fstab, path);

    if (entries.empty()) {

        LERROR << "unknown volume for path [" << path << "]";

        return false;

    }



    for (auto entry : entries) {

        if (TryPathMount(entry, mount_point)) return true;

    }



    LERROR << "Failed to mount for path [" << path << "]";

    return false;

}



bool EnsurePathUnmounted(Fstab* fstab, const std::string& path) {

    auto rec = GetEntryForPath(fstab, path);

    if (rec == nullptr) {