From ed71fa3e82149ad143bd5df43bb990c02cad8474 Mon Sep 17 00:00:00 2001 From: Matt Mower Date: Wed, 16 Apr 2014 13:21:47 -0500 Subject: Only setup settings,andsec partitions if available Change-Id: Iafedcec9e6ba368e29e32ab7a92d774cdd3f64e1 --- partitionmanager.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/partitionmanager.cpp b/partitionmanager.cpp index d4e371551..b947d4307 100644 --- a/partitionmanager.cpp +++ b/partitionmanager.cpp @@ -77,12 +77,12 @@ int TWPartitionManager::Process_Fstab(string Fstab_Filename, bool Display_Error) memset(fstab_line, 0, sizeof(fstab_line)); if (partition->Process_Fstab_Line(line, Display_Error)) { - if (!settings_partition && partition->Is_Settings_Storage) { + if (!settings_partition && partition->Is_Settings_Storage && partition->Is_Present) { settings_partition = partition; } else { partition->Is_Settings_Storage = false; } - if (!andsec_partition && partition->Has_Android_Secure) { + if (!andsec_partition && partition->Has_Android_Secure && partition->Is_Present) { andsec_partition = partition; } else { partition->Has_Android_Secure = false; @@ -110,12 +110,15 @@ int TWPartitionManager::Process_Fstab(string Fstab_Filename, bool Display_Error) else LOGINFO("Error creating fstab\n"); } + if (andsec_partition) { Setup_Android_Secure_Location(andsec_partition); - } else { + } else if (settings_partition) { Setup_Android_Secure_Location(settings_partition); } - Setup_Settings_Storage_Partition(settings_partition); + if (settings_partition) { + Setup_Settings_Storage_Partition(settings_partition); + } Update_System_Details(); UnMount_Main_Partitions(); return true; -- cgit v1.2.3