openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Improve ImageManager error message"

This commit is contained in:
Yo Chiang 2020-08-21 08:01:21 +00:00 committed by Gerrit Code Review
parent 36a21704e0 93c78c243d
commit 5ca85a05e3
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fs_mgr/libfiemap/image_manager.cpp
View File

@ -640,16 +640,22 @@ bool ImageManager::Validate() {
return false;
}
bool ok = true;
for (const auto& partition : metadata->partitions) {
auto name = GetPartitionName(partition);
auto image_path = GetImageHeaderPath(name);
auto fiemap = SplitFiemap::Open(image_path);
if (!fiemap || !fiemap->HasPinnedExtents()) {
LOG(ERROR) << "Image is missing or was moved: " << image_path;
return false;
if (fiemap == nullptr) {
LOG(ERROR) << "SplitFiemap::Open(\"" << image_path << "\") failed";
ok = false;
continue;
}
if (!fiemap->HasPinnedExtents()) {
LOG(ERROR) << "Image doesn't have pinned extents: " << image_path;
ok = false;
}
}
return true;
return ok;
}
bool ImageManager::DisableImage(const std::string& name) {