From 4c5d1f8245beaf411889bbb85b02cb89cb456846 Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Tue, 9 Apr 2019 14:12:44 -0700 Subject: [PATCH] fs_mgr: overlay: wait for logical partition to be created Test: adb-remount-test.sh Bug: 130238923 Change-Id: Iaff01565d6df5c4434e66f742ed0939f61f6005a --- fs_mgr/fs_mgr_overlayfs.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs_mgr/fs_mgr_overlayfs.cpp b/fs_mgr/fs_mgr_overlayfs.cpp index dea484406..730d3db68 100644 --- a/fs_mgr/fs_mgr_overlayfs.cpp +++ b/fs_mgr/fs_mgr_overlayfs.cpp @@ -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,