commit 84e9e60b0f250d92ebb5992c1b25cccb47455c08
author Yifan Hong <elsk@google.com> Fri Nov 30 22:31:39 2018 -0800
committer android-build-merger <android-build-merger@google.com> Fri Nov 30 22:31:39 2018 -0800
tree 30ea5d3400286883fed83ae8bdfa0b053b94815e
parent e633849dc9c49f0168c97fbea3503cd503fd0cf4
parent 7cd903019639b62a30f2c1d510837c0d5a26e0e7

Merge "Fix ensure_path_mounted_at for fsck_unshare_blocks" am: a37aa092c7 am: ec6d0626f4
am: 7cd9030196

Change-Id: Idf3f1debec141803cd821ba22b3ea036c3daf938

fsck_unshare_blocks.cpp

diff --git a/fsck_unshare_blocks.cpp b/fsck_unshare_blocks.cpp
index b653d13..acc453c 100644
--- a/fsck_unshare_blocks.cpp
+++ b/fsck_unshare_blocks.cpp
@@ -121,7 +121,7 @@
 
   // Temporarily mount system so we can copy e2fsck_static.
   std::string system_root = get_system_root();
-  bool mounted = ensure_path_mounted_at(system_root.c_str(), "/mnt/system");
+  bool mounted = ensure_path_mounted_at(system_root.c_str(), "/mnt/system") != -1;
   partitions.push_back(system_root);
 
   if (!mounted) {