commit 4e6507f32817e2943b1f27d12f56b485993c2a44
author Tao Bao <tbao@google.com> Tue Jul 07 00:22:35 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jul 07 00:22:35 2015 +0000
tree 48b7ce5bb1c7db0a55acc152dcc262d32f1a267a
parent 89d3634ffe0855456fe4b33b6aa2abdffeeddfc6
parent 2490dbc9325ad522ec5ee031f5493d2e975f3a49

am 2490dbc9: Merge "Allow mounting squashfs partitions"

* commit '2490dbc9325ad522ec5ee031f5493d2e975f3a49':
  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);