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

Commit d6da069e authored by Yi-Yo Chiang's avatar Yi-Yo Chiang Committed by Automerger Merge Worker
Browse files

Merge "fs_mgr: Add fs_mgr_flag overlayfs_remove_missing_lowerdir" am:... 

Merge "fs_mgr: Add fs_mgr_flag overlayfs_remove_missing_lowerdir" am: 215fde0f am: 09727a9a am: daef3208

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

Change-Id: Ibf6d8742293da6518d287f4abaf92bba4fcc6787
parents b312357d daef3208

fs_mgr/fs_mgr.cpp

+18 −1
Original line number Diff line number Diff line
@@ -2328,7 +2328,24 @@ bool fs_mgr_mount_overlayfs_fstab_entry(const FstabEntry& entry) { 
        return false;

    }



    auto options = "lowerdir=" + entry.lowerdir;

    auto lowerdir = entry.lowerdir;

    if (entry.fs_mgr_flags.overlayfs_remove_missing_lowerdir) {

        bool removed_any = false;

        std::vector<std::string> lowerdirs;

        for (const auto& dir : android::base::Split(entry.lowerdir, ":")) {

            if (access(dir.c_str(), F_OK)) {

                PWARNING << __FUNCTION__ << "(): remove missing lowerdir '" << dir << "'";

                removed_any = true;

            } else {

                lowerdirs.push_back(dir);

            }

        }

        if (removed_any) {

            lowerdir = android::base::Join(lowerdirs, ":");

        }

    }



    auto options = "lowerdir=" + lowerdir;

    if (overlayfs_valid_result == OverlayfsValidResult::kOverrideCredsRequired) {

        options += ",override_creds=off";

    }

fs_mgr/fs_mgr_fstab.cpp

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ void ParseFsMgrFlags(const std::string& flags, FstabEntry* entry) { 
        CheckFlag("fsverity", fs_verity);

        CheckFlag("metadata_csum", ext_meta_csum);

        CheckFlag("fscompress", fs_compress);

        CheckFlag("overlayfs_remove_missing_lowerdir", overlayfs_remove_missing_lowerdir);



#undef CheckFlag

fs_mgr/include_fstab/fstab/fstab.h

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ struct FstabEntry { 
        bool fs_verity : 1;

        bool ext_meta_csum : 1;

        bool fs_compress : 1;

        bool overlayfs_remove_missing_lowerdir : 1;

    } fs_mgr_flags = {};



    bool is_encryptable() const {