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

Commit 946a3552 authored by Kelvin Zhang's avatar Kelvin Zhang Committed by Gerrit Code Review
Browse files

Merge "Allow querying for fstab for a mount point with fstype" into main

parents 6f7fb5a0 6cdee65b

fs_mgr/libfstab/fstab.cpp

+8 −0
Original line number Diff line number Diff line
@@ -849,6 +849,14 @@ std::vector<FstabEntry*> GetEntriesForMountPoint(Fstab* fstab, const std::string 
                            [&path](const FstabEntry& entry) { return entry.mount_point == path; });

}



FstabEntry* GetEntryForMountPoint(Fstab* fstab, const std::string_view path,

                                  const std::string_view fstype) {

    auto&& vec = GetEntriesByPred(fstab, [&path, fstype](const FstabEntry& entry) {

        return entry.mount_point == path && entry.fs_type == fstype;

    });

    return vec.empty() ? nullptr : vec.front();

}



std::vector<const FstabEntry*> GetEntriesForMountPoint(const Fstab* fstab,

                                                       const std::string& path) {

    return GetEntriesByPred(fstab,

fs_mgr/libfstab/include/fstab/fstab.h

+3 −0
Original line number Diff line number Diff line
@@ -108,6 +108,9 @@ std::vector<FstabEntry*> GetEntriesForMountPoint(Fstab* fstab, const std::string 
FstabEntry* GetEntryForMountPoint(Fstab* fstab, const std::string& path);

const FstabEntry* GetEntryForMountPoint(const Fstab* fstab, const std::string& path);



FstabEntry* GetEntryForMountPoint(Fstab* fstab, const std::string_view path,

                                  const std::string_view fstype);



// This method builds DSU fstab entries and transfer the fstab.

//

// fstab points to the unmodified fstab.