commit 15074de25c982779653da62207f125a88c617916
author Treehugger Robot <treehugger-gerrit@google.com> Wed Apr 10 02:04:37 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 10 02:04:37 2019 +0000
tree b95761b88b53649e2af351350c9dfb43bf9127cd
parent 8b39c113f9e4b70663044dc121a0d3f63d6d0f49
parent 4c5d1f8245beaf411889bbb85b02cb89cb456846

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

fs_mgr/fs_mgr_overlayfs.cpp

diff --git a/fs_mgr/fs_mgr_overlayfs.cpp b/fs_mgr/fs_mgr_overlayfs.cpp
index dea4844..730d3db 100644
--- a/fs_mgr/fs_mgr_overlayfs.cpp
+++ b/fs_mgr/fs_mgr_overlayfs.cpp
@@ -715,7 +715,7 @@
     }
 
     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 @@
             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,