commit 332d992a362b07a30c5692db3ee362985f6516c8
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 08 00:16:20 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 08 00:16:20 2020 +0000
tree 08d7c496e9d5184aa53b27f1a70c5048b721a538
parent 33b040b88ba01c771329dd8f52d4fc81a1522393
parent aa7279cacbe91da972799f406cf04465b505788c

Merge "Support AVB chain partitions for HASH descriptors"

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) {