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

Commit 5ab4400d authored by Yo Chiang's avatar Yo Chiang Committed by Gerrit Code Review
Browse files

Merge "TransformFstabForDsu() skips handling special devices"

parents dfaede06 62c75b16

fs_mgr/fs_mgr_fstab.cpp

+6 −2
Original line number Diff line number Diff line
@@ -591,7 +591,7 @@ void TransformFstabForDsu(Fstab* fstab, const std::string& dsu_slot, 
    FstabEntry userdata;

    if (FstabEntry* entry = GetEntryForMountPoint(fstab, "/data")) {

        userdata = *entry;

        userdata.blk_device = "userdata_gsi";

        userdata.blk_device = android::gsi::kDsuUserdata;

        userdata.fs_mgr_flags.logical = true;

        userdata.fs_mgr_flags.formattable = true;

        if (!userdata.metadata_key_dir.empty()) {
@@ -611,7 +611,11 @@ void TransformFstabForDsu(Fstab* fstab, const std::string& dsu_slot, 
            continue;

        }

        // userdata has been handled

        if (StartsWith(partition, "user")) {

        if (partition == android::gsi::kDsuUserdata) {

            continue;

        }

        // scratch is handled by fs_mgr_overlayfs

        if (partition == android::gsi::kDsuScratch) {

            continue;

        }

        // dsu_partition_name = corresponding_partition_name + kDsuPostfix