tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "fs_mgr: set "partition.system.verified" when AVB is used in a A/B device" am: 5c7543569a am: b66306c7c1

Browse source 
am: 50f7d4a1ab

Change-Id: I9afed4e5551a4403696e6635127667e45a031635
This commit is contained in:
Bowgo Tsai 2017-04-28 03:34:46 +00:00 committed by android-build-merger
commit 5547de8f8e
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
fs_mgr/fs_mgr.cpp
View file

@ -1367,7 +1367,8 @@ bool fs_mgr_update_verity_state(fs_mgr_verity_state_callback callback) {
std::string mount_point;
if (system_root && !strcmp(fstab->recs[i].mount_point, "/")) {
mount_point = "system";
// In AVB, the dm device name is vroot instead of system.
mount_point = fs_mgr_is_avb(&fstab->recs[i]) ? "vroot" : "system";
} else {
mount_point = basename(fstab->recs[i].mount_point);
}
@ -1386,6 +1387,10 @@ bool fs_mgr_update_verity_state(fs_mgr_verity_state_callback callback) {
status = &buffer[io->data_start + sizeof(struct dm_target_spec)];
// To be consistent in vboot 1.0 and vboot 2.0 (AVB), change the mount_point
// back to 'system' for the callback. So it has property [partition.system.verified]
// instead of [partition.vroot.verified].
if (mount_point == "vroot") mount_point = "system";
if (*status == 'C' || *status == 'V') {
callback(&fstab->recs[i], mount_point.c_str(), mode, *status);
}