commit fc85a7a848aa3e308b7b6d890e9f8e1476ba9ba7
author JP Abgrall <jpa@google.com> Tue Jun 03 01:01:36 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 03 01:01:36 2014 +0000
tree 5a69bb60c806bdb640a19136ea56d2391ed6a77c
parent bf0f25905b12581f05b65b1ebe95211c727ae483
parent 88f7683d9c935f31ba118defd2ec91de7f5cf11d

Merge "libcutils: fix rw FS remount check issue"

libcutils/android_reboot.c

diff --git a/libcutils/android_reboot.c b/libcutils/android_reboot.c
index b7895fa..5d98295 100644
--- a/libcutils/android_reboot.c
+++ b/libcutils/android_reboot.c
@@ -57,7 +57,7 @@
         mount_dir[255] = 0;
         mount_type[255] = 0;
         mount_opts[255] = 0;
-        if ((match == 6) && !strncmp(mount_dev, "/dev/block", 10) && strstr(mount_opts, "rw")) {
+        if ((match == 6) && !strncmp(mount_dev, "/dev/block", 10) && strstr(mount_opts, "rw,")) {
             found_rw_fs = 1;
             break;
         }