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

Commit dd0ffe29 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "fs_mgr: overlay: wait for logical partition to be created" 

am: 15074de2

Change-Id: Ica7c036a01f90473d0f553872fdf7996cd3d06a7
parents dafe9483 15074de2

fs_mgr/fs_mgr_overlayfs.cpp

+2 −2
Original line number Diff line number Diff line
@@ -715,7 +715,7 @@ bool fs_mgr_overlayfs_create_scratch(const Fstab& fstab, std::string* scratch_de 
    }



    if (changed || partition_create) {

        if (!CreateLogicalPartition(super_device, slot_number, partition_name, true, 0s,

        if (!CreateLogicalPartition(super_device, slot_number, partition_name, true, 10s,

                                    scratch_device))

            return false;
@@ -940,7 +940,7 @@ bool fs_mgr_overlayfs_teardown(const char* mount_point, bool* change) { 
            auto slot_number = fs_mgr_overlayfs_slot_number();

            auto super_device = fs_mgr_overlayfs_super_device(slot_number);

            const auto partition_name = android::base::Basename(kScratchMountPoint);

            CreateLogicalPartition(super_device, slot_number, partition_name, true, 0s,

            CreateLogicalPartition(super_device, slot_number, partition_name, true, 10s,

                                   &scratch_device);

        }

        mount_scratch = fs_mgr_overlayfs_mount_scratch(scratch_device,