commit 501282a42dfbd9f4d33a1009daa387d1d0f0f368
author Mohamad Ayyash <mkayyash@google.com> Thu Jul 02 00:47:06 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 02 00:47:06 2015 +0000
tree dddca694a117bb07276073195683a6f4653f910a
parent 8409b08888d5ec914d7b4aae552bc78f23bcddd5
parent b4b41daa2ddbe8849dacdeeafd240e2a265cb594

am b4b41daa: am 0ddfa329: Allow mounting squashfs partitions

* commit 'b4b41daa2ddbe8849dacdeeafd240e2a265cb594':
  Allow mounting squashfs partitions

roots.cpp

diff --git a/roots.cpp b/roots.cpp
index f863cb2..2bd457e 100644
--- a/roots.cpp
+++ b/roots.cpp
@@ -111,6 +111,7 @@
         }
         return mtd_mount_partition(partition, v->mount_point, v->fs_type, 0);
     } else if (strcmp(v->fs_type, "ext4") == 0 ||
+               strcmp(v->fs_type, "squashfs") == 0 ||
                strcmp(v->fs_type, "vfat") == 0) {
         result = mount(v->blk_device, v->mount_point, v->fs_type,
                        v->flags, v->fs_options);