commit c0cd37be9dd66d5fe7448389a71ee21f60e876e1
author Bowgo Tsai <bowgotsai@google.com> Fri Jun 29 10:31:07 2018 +0800
committer Bowgo Tsai <bowgotsai@google.com> Fri Jun 29 13:35:43 2018 +0800
tree ba8555d4ff19ee947085aba0cef361a2e0b91773
parent e98adee732f773c281aeb1acef8a992a67d22571

Do not unmount /mnt/product/* when vold starts

Bug: 110808288
Test: Boot a device and checks /mnt/product/foo mounted in early mount
      isn't unmounted.

Change-Id: Ide411cd78565505bc72ed57e79f3d31b6392b27c

VolumeManager.cpp

diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index 98f12e8..1a8c79d 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -754,7 +754,8 @@
     while ((mentry = getmntent(fp)) != NULL) {
         auto test = std::string(mentry->mnt_dir);
         if ((android::base::StartsWith(test, "/mnt/") &&
-             !android::base::StartsWith(test, "/mnt/vendor")) ||
+             !android::base::StartsWith(test, "/mnt/vendor") &&
+             !android::base::StartsWith(test, "/mnt/product")) ||
             android::base::StartsWith(test, "/storage/")) {
             toUnmount.push_front(test);
         }