Merge "fs_mgr: overlayfs: CreateDynamicScratch for *partition_exists" am: 684122a264 am: 066cfa3726 am: 47afe8f609

Change-Id: I3d0567affeb31c92a3370585c9b0959a50392d3a
2020-02-12 18:51:38 +00:00 · 2020-02-12 18:51:38 +00:00 · 09bbf6478a
parent 6d3fa224af 47afe8f609
commit 09bbf6478a
1 changed files with 2 additions and 0 deletions
--- a/fs_mgr/fs_mgr_overlayfs.cpp
+++ b/fs_mgr/fs_mgr_overlayfs.cpp
@ -1026,6 +1026,8 @@ static bool CreateDynamicScratch(std::string* scratch_device, bool* partition_ex
        }

        if (change) *change = true;
+    } else if (scratch_device->empty()) {
+        *scratch_device = GetBootScratchDevice();
    }
    return true;
 }