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

Commit 00a8164f authored by Bowgo Tsai's avatar Bowgo Tsai Committed by Automerger Merge Worker
Browse files

Merge "fs_mgr: Don't assume partitions replaced by DSU are logical already"... 

Merge "fs_mgr: Don't assume partitions replaced by DSU are logical already" am: 243df2d9 am: 3e98167a am: 7eae39fd am: 7ef21561

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



Change-Id: Ibbc45e92f3c35f19188ab8aee153ff98ae53948e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a0702978 7ef21561

fs_mgr/fs_mgr_fstab.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -653,6 +653,7 @@ void TransformFstabForDsu(Fstab* fstab, const std::string& dsu_slot, 
                entry->blk_device = partition;

                entry->blk_device = partition;

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

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

                entry->avb_keys = kDsuKeysDir;

                entry->avb_keys = kDsuKeysDir;

                entry->fs_mgr_flags.logical = true;

            }

            }

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

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

            auto partition_ext4 =

            auto partition_ext4 =