More Samsung sdcard crypto fixes
diff --git a/partition.cpp b/partition.cpp
index 44b00ab..f2386d7 100644
--- a/partition.cpp
+++ b/partition.cpp
@@ -705,7 +705,7 @@
return false;
} else {
#ifdef TW_INCLUDE_CRYPTO_SAMSUNG
- if (EcryptFS_Password.size() > 0) {
+ if (EcryptFS_Password.size() > 0 && PartitionManager.Mount_By_Path("/data", false)) {
if (mount_ecryptfs_drive(EcryptFS_Password.c_str(), Mount_Point.c_str(), Mount_Point.c_str(), 0) != 0) {
if (Display_Error)
LOGE("Unable to mount ecryptfs for '%s'\n", Mount_Point.c_str());
@@ -735,6 +735,19 @@
if (never_unmount_system == 1 && Mount_Point == "/system")
return true; // Never unmount system if you're not supposed to unmount it
+#ifdef TW_INCLUDE_CRYPTO_SAMSUNG
+ if (EcryptFS_Password.size() > 0) {
+ if (unmount_ecryptfs_drive(Mount_Point.c_str()) != 0) {
+ if (Display_Error)
+ LOGE("Unable to unmount ecryptfs for '%s'\n", Mount_Point.c_str());
+ else
+ LOGI("Unable to unmount ecryptfs for '%s'\n", Mount_Point.c_str());
+ } else {
+ LOGI("Successfully unmounted ecryptfs for '%s'\n", Mount_Point.c_str());
+ }
+ }
+#endif
+
if (!Symlink_Mount_Point.empty())
umount(Symlink_Mount_Point.c_str());