Merge branch 'gingerbread' of git://github.com/CyanogenMod/android_bootable_recovery into gingerbread
This commit is contained in:
commit
b4812b5b34
@ -795,7 +795,7 @@ void show_nandroid_menu()
|
||||
};
|
||||
|
||||
if (volume_for_path("/emmc") == NULL)
|
||||
INSTALL_MENU_ITEMS[3] = NULL;
|
||||
list[3] = NULL;
|
||||
|
||||
int chosen_item = get_menu_selection(headers, list, 0, 0);
|
||||
switch (chosen_item)
|
||||
|
@ -758,7 +758,7 @@ print_property(const char *key, const char *name, void *cookie) {
|
||||
|
||||
int
|
||||
main(int argc, char **argv) {
|
||||
if (strstr(argv[0], "recovery") == NULL)
|
||||
if (strcmp(basename(argv[0]), "recovery") != 0)
|
||||
{
|
||||
if (strstr(argv[0], "flash_image") != NULL)
|
||||
return flash_image_main(argc, argv);
|
||||
|
Loading…
Reference in New Issue
Block a user