diff options
author | JP Abgrall <jpa@google.com> | 2014-06-03 01:12:15 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-03 01:12:15 +0000 |
commit | 9e18975bac792fc4b0b18d7f679772c577fbd56f (patch) | |
tree | dc5566f90d1479708481851ecc1cff3ef587ae6e /libcutils | |
parent | 4b41092a5dbd8a62a620caa4828dbbb7ef1d4e80 (diff) | |
parent | c99dd0c58d2a7572740599f81b5a20ddb18dbf9e (diff) | |
download | system_core-9e18975bac792fc4b0b18d7f679772c577fbd56f.zip system_core-9e18975bac792fc4b0b18d7f679772c577fbd56f.tar.gz system_core-9e18975bac792fc4b0b18d7f679772c577fbd56f.tar.bz2 |
am c99dd0c5: am 676f7d50: am fc85a7a8: Merge "libcutils: fix rw FS remount check issue"
* commit 'c99dd0c58d2a7572740599f81b5a20ddb18dbf9e':
libcutils: fix rw FS remount check issue
Diffstat (limited to 'libcutils')
-rw-r--r-- | libcutils/android_reboot.c | 2 |
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; } |