summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJP Abgrall <jpa@google.com>2014-06-03 01:05:33 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-03 01:05:33 +0000
commit676f7d509d683921335ccddc2f267a73eb5c60c6 (patch)
tree922b7dad95c4338e76ae1a5c373bb0081087feff
parent00d70979632fb72a7837206476505af3a030f782 (diff)
parentfc85a7a848aa3e308b7b6d890e9f8e1476ba9ba7 (diff)
downloadsystem_core-676f7d509d683921335ccddc2f267a73eb5c60c6.zip
system_core-676f7d509d683921335ccddc2f267a73eb5c60c6.tar.gz
system_core-676f7d509d683921335ccddc2f267a73eb5c60c6.tar.bz2
am fc85a7a8: Merge "libcutils: fix rw FS remount check issue"
* commit 'fc85a7a848aa3e308b7b6d890e9f8e1476ba9ba7': libcutils: fix rw FS remount check issue
-rw-r--r--libcutils/android_reboot.c2
1 files changed, 1 insertions, 1 deletions
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 @@ static int remount_ro_done(void)
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;
}