commit 5fe27b5cb4315fc2fe0633feede4080032ef878e
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 08 00:48:40 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 08 00:48:40 2020 +0000
tree 9f42b5027c635b2f2d7735bf41f1dbf63e84b34f
parent 27abe0636744c27047ce48d4b4629eb3868985cf
parent c6d3df546a5aba72633e01f5c137c2d5a70c3426

Merge "Support AVB chain partitions for HASH descriptors" am: 4d82b283dd am: 7755c46a09 am: 43d554bb66

Change-Id: Id3c1f0efa07b5be34679ea683bcf30c854976e7b

init/first_stage_mount.cpp

diff --git a/init/first_stage_mount.cpp b/init/first_stage_mount.cpp
index e5e99e1..6d1259d 100644
--- a/init/first_stage_mount.cpp
+++ b/init/first_stage_mount.cpp
@@ -558,6 +558,14 @@
             continue;
         }
 
+        // Skip raw partition entries such as boot, dtbo, etc.
+        // Having emmc fstab entries allows us to probe current->vbmeta_partition
+        // in InitDevices() when they are AVB chained partitions.
+        if (current->fs_type == "emmc") {
+            ++current;
+            continue;
+        }
+
         Fstab::iterator end;
         if (!MountPartition(current, false /* erase_same_mounts */, &end)) {
             if (current->fs_mgr_flags.no_fail) {