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

Merge "Acknowledge the 'nofail' fs_mgr flag and skip the expected failure." am: e8acc83d25 am: 3a149b6735

Browse source 
Change-Id: Icb1ef75616ebc3bfe3f1e71a93ca25b42cb348ae
This commit is contained in:
Treehugger Robot 2020-05-06 17:39:50 +00:00 committed by Automerger Merge Worker
commit 93dcfef249
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
main.cpp
View file

@ -242,7 +242,8 @@ static int process_config(VolumeManager* vm, VoldConfigs* configs) {
} }
/* Make sure logical partitions have an updated blk_device. */ /* 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; PLOG(FATAL) << "could not find logical partition " << entry.blk_device;
} }