summaryrefslogtreecommitdiffstats
path: root/partitionmanager.cpp
diff options
context:
space:
mode:
authorMatt Mower <mowerm@gmail.com>2014-04-16 20:21:47 +0200
committerGerrit Code Review <gerrit2@gerrit>2014-04-16 21:58:07 +0200
commited71fa3e82149ad143bd5df43bb990c02cad8474 (patch)
tree681affd56d33b47a534b05bdddd8de193e3eea9a /partitionmanager.cpp
parentMore MD5 verification error handling (diff)
downloadandroid_bootable_recovery-ed71fa3e82149ad143bd5df43bb990c02cad8474.tar
android_bootable_recovery-ed71fa3e82149ad143bd5df43bb990c02cad8474.tar.gz
android_bootable_recovery-ed71fa3e82149ad143bd5df43bb990c02cad8474.tar.bz2
android_bootable_recovery-ed71fa3e82149ad143bd5df43bb990c02cad8474.tar.lz
android_bootable_recovery-ed71fa3e82149ad143bd5df43bb990c02cad8474.tar.xz
android_bootable_recovery-ed71fa3e82149ad143bd5df43bb990c02cad8474.tar.zst
android_bootable_recovery-ed71fa3e82149ad143bd5df43bb990c02cad8474.zip
Diffstat (limited to 'partitionmanager.cpp')
-rw-r--r--partitionmanager.cpp11
1 files 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;