summaryrefslogtreecommitdiffstats
path: root/libcutils
diff options
context:
space:
mode:
authorJP Abgrall <jpa@google.com>2014-06-03 01:09:07 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-03 01:09:07 +0000
commitc99dd0c58d2a7572740599f81b5a20ddb18dbf9e (patch)
tree6f0864df79c16ce45d6ea2037142da630da6466f /libcutils
parent5ce10c4d2415f25a4d2bfbf49c50bb152dff0fa2 (diff)
parent676f7d509d683921335ccddc2f267a73eb5c60c6 (diff)
downloadsystem_core-c99dd0c58d2a7572740599f81b5a20ddb18dbf9e.zip
system_core-c99dd0c58d2a7572740599f81b5a20ddb18dbf9e.tar.gz
system_core-c99dd0c58d2a7572740599f81b5a20ddb18dbf9e.tar.bz2
am 676f7d50: am fc85a7a8: Merge "libcutils: fix rw FS remount check issue"
* commit '676f7d509d683921335ccddc2f267a73eb5c60c6': libcutils: fix rw FS remount check issue
Diffstat (limited to 'libcutils')
-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;
}