Merge "Acknowledge the 'nofail' fs_mgr flag and skip the expected failure." am: e8acc83d25
Change-Id: I1fb2dbb0de98e3e2deadce25183aa37f2bc7c4ba
This commit is contained in:
commit
3a149b6735
1 changed files with 2 additions and 1 deletions
3
main.cpp
3
main.cpp
|
@ -242,7 +242,8 @@ static int process_config(VolumeManager* vm, VoldConfigs* configs) {
|
|||
}
|
||||
|
||||
/* Make sure logical partitions have an updated blk_device. */
|
||||
if (entry.fs_mgr_flags.logical && !fs_mgr_update_logical_partition(&entry)) {
|
||||
if (entry.fs_mgr_flags.logical && !fs_mgr_update_logical_partition(&entry) &&
|
||||
!entry.fs_mgr_flags.no_fail) {
|
||||
PLOG(FATAL) << "could not find logical partition " << entry.blk_device;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue