| commit | 868da9b51ce08a28b44b1437634a3c2637efd103 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Sep 06 01:37:17 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 06 01:37:17 2024 +0000 |
| tree | eff4ac8b11b1548d21bcf0018adc49503af63f42 | |
| parent | 7284161301b6286eb602e8db31f096c2c04d3e4c [diff] | |
| parent | 2037a1d4c8a0cc62ad93f4bdb4d3f1de049c9315 [diff] |
Merge "snapshotctl: Check device for -img path" into main am: 536aa62490 am: 2037a1d4c8 Original change: https://android-review.googlesource.com/c/platform/system/core/+/3257311 Change-Id: I239d3f787a0ea89b7cf20f754dd98cea372a5640 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/fs_mgr/libsnapshot/snapshotctl.cpp b/fs_mgr/libsnapshot/snapshotctl.cpp index 23c3ccf..97a8cb2 100644 --- a/fs_mgr/libsnapshot/snapshotctl.cpp +++ b/fs_mgr/libsnapshot/snapshotctl.cpp
@@ -255,6 +255,8 @@ } LOG(INFO) << "Failed to find cow path: " << cow_device << " Checking the device for -img path"; + // If the COW device exists only on /data + cow_device = partition_name + "-cow-img"; if (!dm.GetDmDevicePathByName(cow_device, cow_path)) { LOG(ERROR) << "Failed to cow path: " << cow_device; return false;