commit 88f11b937499a5d5b308a8098d671fd95e32dc00
author Alessandro Astone <ales.astone@gmail.com> Sun Sep 29 17:56:49 2019 +0200
committer Arne Coucheron <arco68@gmail.com> Tue Jan 28 20:27:27 2020 +0100
tree 0def75d71966b0af2254503a75e5013c4c267b8c
parent bf3a4b2ebaa20b5be9499eaee5578ae1a93c6597

recovery: sdcard is data/media/0

Change-Id: Ie9978ac8b526c11199f72c4362ae3313218b48d4

install/fuse_sdcard_install.cpp

diff --git a/install/fuse_sdcard_install.cpp b/install/fuse_sdcard_install.cpp
index 4d324c2..abf3bf3 100644
--- a/install/fuse_sdcard_install.cpp
+++ b/install/fuse_sdcard_install.cpp
@@ -38,7 +38,7 @@
 #include "install/install.h"
 #include "otautil/roots.h"
 
-static constexpr const char* SDCARD_ROOT = "/sdcard";
+static constexpr const char* SDCARD_ROOT = "/data/media/0";
 // How long (in seconds) we wait for the fuse-provided package file to
 // appear, before timing out.
 static constexpr int SDCARD_INSTALL_TIMEOUT = 10;

otautil/roots.cpp

diff --git a/otautil/roots.cpp b/otautil/roots.cpp
index be2f802..540a119 100644
--- a/otautil/roots.cpp
+++ b/otautil/roots.cpp
@@ -311,7 +311,7 @@
         return -1;
       }
     } else {
-      if (ensure_path_unmounted(entry.mount_point) != 0) {
+      if (ensure_path_unmounted(entry.mount_point) != 0 && entry.mount_point != "/data") {
         LOG(ERROR) << "Failed to unmount " << entry.mount_point;
         return -1;
       }