diff options
| author | Martijn Coenen <maco@google.com> | 2020-01-11 19:24:26 +0100 |
|---|---|---|
| committer | Martijn Coenen <maco@google.com> | 2020-01-11 19:24:26 +0100 |
| commit | b0e977a0b1f226e8a88a5e61cc415a424fcda21a (patch) | |
| tree | 03a8dd30df2a2726a087498a0ee9a7dbd9c42486 /VolumeManager.cpp | |
| parent | 60ddb198b7ac31596cb62cac52ac4e465f8f967c (diff) | |
| download | vold-b0e977a0b1f226e8a88a5e61cc415a424fcda21a.tar.gz | |
vold: Don't unmount /mnt/installer on start.
This is a slave bind mount of /mnt/user, created before we create the
two mount namespaces. Unmounting it here prevents us from re-creating it
in the right way, so leave it alone.
Bug: 134706060
Test: verify mount is still there after vold starts
Change-Id: Iaac91953cbb9abfef0aaac60f74b99b16c943f87
Diffstat (limited to 'VolumeManager.cpp')
| -rw-r--r-- | VolumeManager.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/VolumeManager.cpp b/VolumeManager.cpp index 98cb060a..d8b1e328 100644 --- a/VolumeManager.cpp +++ b/VolumeManager.cpp @@ -806,7 +806,8 @@ int VolumeManager::unmountAll() { #ifdef __ANDROID_DEBUGGABLE__ !StartsWith(test, "/mnt/scratch") && #endif - !StartsWith(test, "/mnt/vendor") && !StartsWith(test, "/mnt/product")) || + !StartsWith(test, "/mnt/vendor") && !StartsWith(test, "/mnt/product") && + !StartsWith(test, "/mnt/installer")) || StartsWith(test, "/storage/")) { toUnmount.push_front(test); } |