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

Commit 8df37180 authored by Yo Chiang's avatar Yo Chiang Committed by Automerger Merge Worker
Browse files

Merge "TranformFstabForDsu adds missing partition entries to fstab" am: 36a21704 am: 792650d4 

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

Change-Id: I0bc04d7e8c5c190d6add66a470e6aa9754e51724
parents 05573779 792650d4

fs_mgr/fs_mgr_fstab.cpp

+2 −1
Original line number Diff line number Diff line
@@ -635,13 +635,14 @@ void TransformFstabForDsu(Fstab* fstab, const std::vector<std::string>& dsu_part 
            entry.fs_mgr_flags.wait = true;

            entry.fs_mgr_flags.logical = true;

            entry.fs_mgr_flags.first_stage_mount = true;

            fstab->emplace_back(entry);

        } else {

            // If the corresponding partition exists, transform all its Fstab

            // by pointing .blk_device to the DSU partition.

            for (auto&& entry : entries) {

                entry->blk_device = partition;

                // AVB keys for DSU should always be under kDsuKeysDir.

                entry->avb_keys += kDsuKeysDir;

                entry->avb_keys = kDsuKeysDir;

            }

            // Make sure the ext4 is included to support GSI.

            auto partition_ext4 =