Merge branch 'gingerbread' of git://github.com/CyanogenMod/android_bootable_recovery into gingerbread

This commit is contained in:
root 2011-06-10 01:30:05 +01:00
commit 1f40b86175
2 changed files with 6 additions and 2 deletions

View File

@ -491,7 +491,7 @@ int is_safe_to_format(char* name)
{
char str[255];
char* partition;
property_get("ro.cwm.forbid_format", str, "/misc,/radio,/bootloader,/recovery");
property_get("ro.cwm.forbid_format", str, "/misc,/radio,/bootloader,/recovery,/efs");
partition = strtok(str, ", ");
while (partition != NULL) {

View File

@ -786,7 +786,11 @@ main(int argc, char **argv) {
return busybox_driver(argc, argv);
}
__system("/sbin/postrecoveryboot.sh");
if (volume_for_path("/sdcard") == NULL) {
rmdir("/sdcard");
symlink("/data/media", "/sdcard");
}
int is_user_initiated_recovery = 0;
time_t start = time(NULL);