Fix SDCard partitioning

This commit is contained in:
Dees_Troy
2012-09-26 13:12:09 -04:00
parent b1dab8dca9
commit a2ac96a2f2
12 changed files with 22 additions and 14 deletions
+11 -3
View File
@@ -27,7 +27,6 @@
extern "C" {
#include "../common.h"
#include "../roots.h"
#include "../tw_reboot.h"
#include "../minuitwrp/minui.h"
#include "../recovery_ui.h"
@@ -827,8 +826,17 @@ int GUIAction::doAction(Action action, int isThreaded /* = 0 */)
// Below seen in Koush's recovery
char sddevice[256];
char mkdir_path[255];
Volume *vol = volume_for_path("/sdcard");
strcpy(sddevice, vol->device);
#ifdef TW_EXTERNAL_STORAGE_PATH
TWPartition* SDCard = PartitionManager.Find_Partition_By_Path(EXPAND(TW_EXTERNAL_STORAGE_PATH));
#else
TWPartition* SDCard = PartitionManager.Find_Partition_By_Path("/sdcard");
#endif
if (SDCard == NULL) {
LOGE("Unable to locate device to partition.\n");
operation_end(1, simulate);
return 0;
}
strcpy(sddevice, SDCard->Actual_Block_Device.c_str());
// Just need block not whole partition
sddevice[strlen("/dev/block/mmcblkX")] = '\0';
+1 -1
View File
@@ -2720,7 +2720,7 @@
<action function="set">tw_action2_param=tw_zip_location=/sdcard</action>
<action function="set">tw_action_text1=Partitioning SD Card...</action>
<action function="set">tw_action_text2=This will take a few minutes.</action>
<action function="set">tw_complete_text1=Fix Permissions Complete</action>
<action function="set">tw_complete_text1=Partitioning Complete</action>
<action function="page">action_page</action>
</actions>
</object>
+1 -1
View File
@@ -2720,7 +2720,7 @@
<action function="set">tw_action2_param=tw_zip_location=/sdcard</action>
<action function="set">tw_action_text1=Partitioning SD Card...</action>
<action function="set">tw_action_text2=This will take a few minutes.</action>
<action function="set">tw_complete_text1=Fix Permissions Complete</action>
<action function="set">tw_complete_text1=Partitioning Complete</action>
<action function="page">action_page</action>
</actions>
</object>
+1 -1
View File
@@ -2720,7 +2720,7 @@
<action function="set">tw_action2_param=tw_zip_location=/sdcard</action>
<action function="set">tw_action_text1=Partitioning SD Card...</action>
<action function="set">tw_action_text2=This will take a few minutes.</action>
<action function="set">tw_complete_text1=Fix Permissions Complete</action>
<action function="set">tw_complete_text1=Partitioning Complete</action>
<action function="page">action_page</action>
</actions>
</object>
+1 -1
View File
@@ -2720,7 +2720,7 @@
<action function="set">tw_action2_param=tw_zip_location=/sdcard</action>
<action function="set">tw_action_text1=Partitioning SD Card...</action>
<action function="set">tw_action_text2=This will take a few minutes.</action>
<action function="set">tw_complete_text1=Fix Permissions Complete</action>
<action function="set">tw_complete_text1=Partitioning Complete</action>
<action function="page">action_page</action>
</actions>
</object>
+1 -1
View File
@@ -2712,7 +2712,7 @@
<action function="set">tw_action2_param=tw_zip_location=/sdcard</action>
<action function="set">tw_action_text1=Partitioning SD Card...</action>
<action function="set">tw_action_text2=This will take a few minutes.</action>
<action function="set">tw_complete_text1=Fix Permissions Complete</action>
<action function="set">tw_complete_text1=Partitioning Complete</action>
<action function="page">action_page</action>
</actions>
</object>
+1 -1
View File
@@ -2711,7 +2711,7 @@
<action function="set">tw_action2_param=tw_zip_location=/sdcard</action>
<action function="set">tw_action_text1=Partitioning SD Card...</action>
<action function="set">tw_action_text2=This will take a few minutes.</action>
<action function="set">tw_complete_text1=Fix Permissions Complete</action>
<action function="set">tw_complete_text1=Partitioning Complete</action>
<action function="page">action_page</action>
</actions>
</object>
+1 -1
View File
@@ -2710,7 +2710,7 @@
<action function="set">tw_action2_param=tw_zip_location=/sdcard</action>
<action function="set">tw_action_text1=Partitioning SD Card...</action>
<action function="set">tw_action_text2=This will take a few minutes.</action>
<action function="set">tw_complete_text1=Fix Permissions Complete</action>
<action function="set">tw_complete_text1=Partitioning Complete</action>
<action function="page">action_page</action>
</actions>
</object>
+1 -1
View File
@@ -2711,7 +2711,7 @@
<action function="set">tw_action2_param=tw_zip_location=/sdcard</action>
<action function="set">tw_action_text1=Partitioning SD Card...</action>
<action function="set">tw_action_text2=This will take a few minutes.</action>
<action function="set">tw_complete_text1=Fix Permissions Complete</action>
<action function="set">tw_complete_text1=Partitioning Complete</action>
<action function="page">action_page</action>
</actions>
</object>
+1 -1
View File
@@ -2716,7 +2716,7 @@
<action function="set">tw_action2_param=tw_zip_location=/sdcard</action>
<action function="set">tw_action_text1=Partitioning SD Card...</action>
<action function="set">tw_action_text2=This will take a few minutes.</action>
<action function="set">tw_complete_text1=Fix Permissions Complete</action>
<action function="set">tw_complete_text1=Partitioning Complete</action>
<action function="page">action_page</action>
</actions>
</object>
+1 -1
View File
@@ -2712,7 +2712,7 @@
<action function="set">tw_action2_param=tw_zip_location=/sdcard</action>
<action function="set">tw_action_text1=Partitioning SD Card...</action>
<action function="set">tw_action_text2=This will take a few minutes.</action>
<action function="set">tw_complete_text1=Fix Permissions Complete</action>
<action function="set">tw_complete_text1=Partitioning Complete</action>
<action function="page">action_page</action>
</actions>
</object>
+1 -1
View File
@@ -2720,7 +2720,7 @@
<action function="set">tw_action2_param=tw_zip_location=/sdcard</action>
<action function="set">tw_action_text1=Partitioning SD Card...</action>
<action function="set">tw_action_text2=This will take a few minutes.</action>
<action function="set">tw_complete_text1=Fix Permissions Complete</action>
<action function="set">tw_complete_text1=Partitioning Complete</action>
<action function="page">action_page</action>
</actions>
</object>