remove the notion of "root path"; support mixed flash types
Remove the wacky notion of "roots" and "root paths" (those things that
look like "FOO:some/path" instead of just "/foo/some/path"). Let each
device specify its own table of available partitions and how to mount
them (needed for devices that use both MTD/yaffs2 and EMMC/ext4
partitions).
(Cherrypicked from gingerbread w/slight edits.)
Change-Id: I2479ce76b13e73f1d12035c89386c3a82b3edf51
diff --git a/encryptedfs_provisioning.c b/encryptedfs_provisioning.c
index 2bcfec1..601c817 100644
--- a/encryptedfs_provisioning.c
+++ b/encryptedfs_provisioning.c
@@ -186,7 +186,7 @@
int read_encrypted_fs_info(encrypted_fs_info *encrypted_fs_data) {
int result;
int value;
- result = ensure_root_path_mounted("DATA:");
+ result = ensure_path_mounted("/data");
if (result != 0) {
LOGE("Secure FS: error mounting userdata partition.");
return ENCRYPTED_FS_ERROR;
@@ -221,7 +221,7 @@
return ENCRYPTED_FS_ERROR;
}
- result = ensure_root_path_unmounted("DATA:");
+ result = ensure_path_unmounted("/data");
if (result != 0) {
LOGE("Secure FS: error unmounting data partition.");
return ENCRYPTED_FS_ERROR;
@@ -232,7 +232,7 @@
int restore_encrypted_fs_info(encrypted_fs_info *encrypted_fs_data) {
int result;
- result = ensure_root_path_mounted("DATA:");
+ result = ensure_path_mounted("/data");
if (result != 0) {
LOGE("Secure FS: error mounting userdata partition.");
return ENCRYPTED_FS_ERROR;
@@ -273,7 +273,7 @@
return result;
}
- result = ensure_root_path_unmounted("DATA:");
+ result = ensure_path_unmounted("/data");
if (result != 0) {
LOGE("Secure FS: error unmounting data partition.");
return ENCRYPTED_FS_ERROR;
@@ -281,4 +281,3 @@
return ENCRYPTED_FS_OK;
}
-