commit e8acc83d25135299f512ecbe524c3492b6ee57b3
author Treehugger Robot <treehugger-gerrit@google.com> Wed May 06 17:02:43 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 06 17:02:43 2020 +0000
tree e961cd4d9a9aa1684daa62055c5a7412c35f942a
parent 9e2053e1851be8c908cc45840c9b574408beec77
parent 167c2a658a37b24376702c19a2e83939736a88ed

Merge "Acknowledge the 'nofail' fs_mgr flag and skip the expected failure."

main.cpp

diff --git a/main.cpp b/main.cpp
index 402ba0a..1f85fb5 100644
--- a/main.cpp
+++ b/main.cpp
@@ -242,7 +242,8 @@
         }
 
         /* 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;
         }