aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJP Abgrall <jpa@google.com>2014-10-23 16:27:03 -0700
committerThe Android Automerger <android-build@google.com>2014-10-24 16:05:13 -0700
commit3638ea98ba14c5a8ef53ee7efca8560dc77123c0 (patch)
tree855e932a1c2f58d52c2975cd682a2955cf730b01
parent0d82e8106aeffa47599c34eac752f6457249f973 (diff)
downloadbuild-3638ea98ba14c5a8ef53ee7efca8560dc77123c0.tar.gz
core: Fixup bad ext4 mount options for recovery (pick common denominator)
Some ext4 options were not suitable for all kernel versions. The current option were checked against kernels 3.0 3.4 3.10. Bug: 18092222 Change-Id: I30883706e5c8ac7a318f4b448d4becde50de808f
-rw-r--r--core/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/Makefile b/core/Makefile
index f411e066b5..2177a182da 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -678,7 +678,8 @@ endif
# <fstype>=<fstype_opts>[|<fstype_opts>]...
# fstype_opts := <opt>[,<opt>]...
# opt := <name>[=<value>]
-DEFAULT_TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS := ext4=match_batch_time=0,commit=1,data=journal,barrier=1,errors=panic,nodelalloc
+# The following worked on Nexus devices with Kernel 3.1, 3.4, 3.10
+DEFAULT_TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS := ext4=max_batch_time=0,commit=1,data=ordered,barrier=1,errors=panic,nodelalloc
ifneq (true,$(TARGET_USERIMAGES_SPARSE_EXT_DISABLED))
INTERNAL_USERIMAGES_SPARSE_EXT_FLAG := -s