cwr 5
Change-Id: I70cbb4df78b0bbc9d227d19aa6d9434eba2b540d
diff --git a/Android.mk b/Android.mk
index 00fa078..255ccd0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,17 +22,21 @@
edifyscripting.c \
setprop.c
+ADDITIONAL_RECOVERY_FILES := $(shell echo $$ADDITIONAL_RECOVERY_FILES)
+LOCAL_SRC_FILES += $(ADDITIONAL_RECOVERY_FILES)
+
LOCAL_MODULE := recovery
LOCAL_FORCE_STATIC_EXECUTABLE := true
ifdef I_AM_KOUSH
RECOVERY_NAME := ClockworkMod Recovery
+LOCAL_CFLAGS += -DI_AM_KOUSH
else
RECOVERY_NAME := CWM-based Recovery
endif
-RECOVERY_VERSION := $(RECOVERY_NAME) v4.0.1.5
+RECOVERY_VERSION := $(RECOVERY_NAME) v5.0.2.1
LOCAL_CFLAGS += -DRECOVERY_VERSION="$(RECOVERY_VERSION)"
RECOVERY_API_VERSION := 2
diff --git a/edifyscripting.c b/edifyscripting.c
index 89554d7..389f1c9 100644
--- a/edifyscripting.c
+++ b/edifyscripting.c
@@ -233,7 +233,24 @@
return StringValue(strdup(path));
}
+Value* MountFn(const char* name, State* state, int argc, Expr* argv[]) {
+ char* result = NULL;
+ if (argc != 1) {
+ return ErrorAbort(state, "%s() expects 1 args, got %d", name, argc);
+ }
+ char* path;
+ if (ReadArgs(state, argv, 1, &path) < 0) {
+ return NULL;
+ }
+
+ if (0 != ensure_path_mounted(path))
+ return StringValue(strdup(""));
+
+ return StringValue(strdup(path));
+}
+
void RegisterRecoveryHooks() {
+ RegisterFunction("mount", MountFn);
RegisterFunction("format", FormatFn);
RegisterFunction("ui_print", UIPrintFn);
RegisterFunction("run_program", RunProgramFn);
diff --git a/extendedcommands.c b/extendedcommands.c
index a03a1b7..86ee3d0 100644
--- a/extendedcommands.c
+++ b/extendedcommands.c
@@ -40,6 +40,7 @@
#include "flashutils/flashutils.h"
#include "edify/expr.h"
#include <libgen.h>
+#include "mtdutils/mtdutils.h"
int signature_check_enabled = 1;
@@ -81,11 +82,13 @@
"apply /sdcard/update.zip",
"toggle signature verification",
"toggle script asserts",
+ "choose zip from internal sdcard",
NULL };
#define ITEM_CHOOSE_ZIP 0
#define ITEM_APPLY_SDCARD 1
#define ITEM_SIG_CHECK 2
#define ITEM_ASSERTS 3
+#define ITEM_CHOOSE_ZIP_INT 4
void show_install_update_menu()
{
@@ -93,6 +96,10 @@
"",
NULL
};
+
+ if (volume_for_path("/emmc") == NULL)
+ INSTALL_MENU_ITEMS[ITEM_CHOOSE_ZIP_INT] = NULL;
+
for (;;)
{
int chosen_item = get_menu_selection(headers, INSTALL_MENU_ITEMS, 0, 0);
@@ -111,7 +118,10 @@
break;
}
case ITEM_CHOOSE_ZIP:
- show_choose_zip_menu();
+ show_choose_zip_menu("/sdcard/");
+ break;
+ case ITEM_CHOOSE_ZIP_INT:
+ show_choose_zip_menu("/emmc/");
break;
default:
return;
@@ -301,10 +311,10 @@
return return_value;
}
-void show_choose_zip_menu()
+void show_choose_zip_menu(const char *mount_point)
{
- if (ensure_path_mounted("/sdcard") != 0) {
- LOGE ("Can't mount /sdcard\n");
+ if (ensure_path_mounted(mount_point) != 0) {
+ LOGE ("Can't mount %s\n", mount_point);
return;
}
@@ -313,7 +323,7 @@
NULL
};
- char* file = choose_file_menu("/sdcard/", ".zip", headers);
+ char* file = choose_file_menu(mount_point, ".zip", headers);
if (file == NULL)
return;
static char* confirm_install = "Confirm install?";
@@ -419,6 +429,70 @@
#define TUNE2FS_BIN "/sbin/tune2fs"
#define E2FSCK_BIN "/sbin/e2fsck"
+int format_device(const char *device, const char *path, const char *fs_type) {
+ Volume* v = volume_for_path(path);
+ if (v == NULL) {
+ // no /sdcard? let's assume /data/media
+ if (strstr(path, "/sdcard") == path && is_data_media()) {
+ return format_unknown_device(NULL, path, NULL);
+ }
+ // silent failure for sd-ext
+ if (strcmp(path, "/sd-ext") == 0)
+ return -1;
+ LOGE("unknown volume \"%s\"\n", path);
+ return -1;
+ }
+ if (strcmp(fs_type, "ramdisk") == 0) {
+ // you can't format the ramdisk.
+ LOGE("can't format_volume \"%s\"", path);
+ return -1;
+ }
+
+ if (strcmp(v->mount_point, path) != 0) {
+ return format_unknown_device(v->device, path, NULL);
+ }
+
+ if (ensure_path_unmounted(path) != 0) {
+ LOGE("format_volume failed to unmount \"%s\"\n", v->mount_point);
+ return -1;
+ }
+
+ if (strcmp(fs_type, "yaffs2") == 0 || strcmp(fs_type, "mtd") == 0) {
+ mtd_scan_partitions();
+ const MtdPartition* partition = mtd_find_partition_by_name(device);
+ if (partition == NULL) {
+ LOGE("format_volume: no MTD partition \"%s\"\n", device);
+ return -1;
+ }
+
+ MtdWriteContext *write = mtd_write_partition(partition);
+ if (write == NULL) {
+ LOGW("format_volume: can't open MTD \"%s\"\n", device);
+ return -1;
+ } else if (mtd_erase_blocks(write, -1) == (off_t) -1) {
+ LOGW("format_volume: can't erase MTD \"%s\"\n", device);
+ mtd_write_close(write);
+ return -1;
+ } else if (mtd_write_close(write)) {
+ LOGW("format_volume: can't close MTD \"%s\"\n",device);
+ return -1;
+ }
+ return 0;
+ }
+
+ if (strcmp(fs_type, "ext4") == 0) {
+ reset_ext4fs_info();
+ int result = make_ext4fs(device, NULL, NULL, 0, 0, 0);
+ if (result != 0) {
+ LOGE("format_volume: make_extf4fs failed on %s\n", device);
+ return -1;
+ }
+ return 0;
+ }
+
+ return format_unknown_device(device, path, fs_type);
+}
+
int format_unknown_device(const char *device, const char* path, const char *fs_type)
{
LOGI("Formatting unknown device.\n");
@@ -738,7 +812,32 @@
ui_print("Timed out waiting for SD card... continuing anyways.");
}
+ ui_print("Verifying SD Card marker...\n");
+ struct stat st;
+ if (stat("/sdcard/clockworkmod/.salted_hash", &st) != 0) {
+ ui_print("SD Card marker not found...\n");
+ if (volume_for_path("/emmc") != NULL) {
+ ui_print("Checking Internal SD Card marker...\n");
+ ensure_path_unmounted("/sdcard");
+ if (ensure_path_mounted_at_mount_point("/emmc", "/sdcard") != 0) {
+ ui_print("Internal SD Card marker not found... continuing anyways.\n");
+ // unmount everything, and remount as normal
+ ensure_path_unmounted("/emmc");
+ ensure_path_unmounted("/sdcard");
+
+ ensure_path_mounted("/sdcard");
+ }
+ }
+ }
+
sprintf(tmp, "/tmp/%s", basename(EXTENDEDCOMMAND_SCRIPT));
+ int ret;
+#ifdef I_AM_KOUSH
+ if (0 != (ret = before_run_script(tmp))) {
+ ui_print("Error processing ROM Manager script. Please verify you have ROM Manager v4.4.0.0 or higher installed.\n");
+ return ret;
+ }
+#endif
return run_script(tmp);
}
@@ -910,9 +1009,9 @@
__system("rm -r /data/dalvik-cache");
__system("rm -r /cache/dalvik-cache");
__system("rm -r /sd-ext/dalvik-cache");
+ ui_print("Dalvik Cache wiped.\n");
}
ensure_path_unmounted("/data");
- ui_print("Dalvik Cache wiped.\n");
break;
}
case 2:
diff --git a/nandroid-md5.sh b/nandroid-md5.sh
index 0db53ee..03d4a46 100755
--- a/nandroid-md5.sh
+++ b/nandroid-md5.sh
@@ -1,4 +1,12 @@
#!/sbin/sh
cd $1
-md5sum *img > nandroid.md5
-return $?
\ No newline at end of file
+rm -f /tmp/nandroid.md5
+md5sum * .* > /tmp/nandroid.md5
+cp /tmp/nandroid.md5 .
+# need this because wildcard seems to cause md5sum to return 1
+if [ -f nandroid.md5 ]
+then
+ return 0
+else
+ return 1
+fi
\ No newline at end of file
diff --git a/nandroid.c b/nandroid.c
index f4b2a74..30190fa 100644
--- a/nandroid.c
+++ b/nandroid.c
@@ -101,15 +101,17 @@
typedef int (*nandroid_backup_handler)(const char* backup_path, const char* backup_file_image, int callback);
static int mkyaffs2image_wrapper(const char* backup_path, const char* backup_file_image, int callback) {
- return mkyaffs2image(backup_path, backup_file_image, 0, callback ? yaffs_callback : NULL);
+ char backup_file_image_with_extension[PATH_MAX];
+ sprintf(backup_file_image_with_extension, "%s.img", backup_file_image);
+ return mkyaffs2image(backup_path, backup_file_image_with_extension, 0, callback ? yaffs_callback : NULL);
}
static int tar_compress_wrapper(const char* backup_path, const char* backup_file_image, int callback) {
char tmp[PATH_MAX];
if (strcmp(backup_path, "/data") == 0 && volume_for_path("/sdcard") == NULL)
- sprintf(tmp, "cd $(dirname %s) ; tar cvf %s --exclude 'media' $(basename %s) ; exit $?", backup_path, backup_file_image, backup_path);
+ sprintf(tmp, "cd $(dirname %s) ; tar cvf %s.tar --exclude 'media' $(basename %s) ; exit $?", backup_path, backup_file_image, backup_path);
else
- sprintf(tmp, "cd $(dirname %s) ; tar cvf %s $(basename %s) ; exit $?", backup_path, backup_file_image, backup_path);
+ sprintf(tmp, "cd $(dirname %s) ; tar cvf %s.tar $(basename %s) ; exit $?", backup_path, backup_file_image, backup_path);
FILE *fp = __popen(tmp, "r");
if (fp == NULL) {
@@ -132,7 +134,6 @@
ui_print("Unable to find volume.\n");
return NULL;
}
- scan_mounted_volumes();
MountedVolume *mv = find_mounted_volume_by_mount_point(v->mount_point);
if (mv == NULL) {
ui_print("Unable to find mounted volume: %s\n", v->mount_point);
@@ -143,14 +144,15 @@
return tar_compress_wrapper;
}
- char str[255];
- char* partition;
- property_get("ro.cwm.prefer_tar", str, "false");
- if (strcmp("true", str) != 0) {
+ // cwr5, we prefer tar for everything except yaffs2
+ if (strcmp("yaffs2", mv->filesystem) == 0) {
return mkyaffs2image_wrapper;
}
- if (strcmp("yaffs2", mv->filesystem) == 0) {
+ char str[255];
+ char* partition;
+ property_get("ro.cwm.prefer_tar", str, "true");
+ if (strcmp("true", str) != 0) {
return mkyaffs2image_wrapper;
}
@@ -163,7 +165,7 @@
char* name = basename(mount_point);
struct stat file_info;
- int callback = stat("/sdcard/clockworkmod/.hidenandroidprogress", &file_info) == 0;
+ int callback = stat("/sdcard/clockworkmod/.hidenandroidprogress", &file_info) != 0;
ui_print("Backing up %s...\n", name);
if (0 != (ret = ensure_path_mounted(mount_point) != 0)) {
@@ -172,7 +174,15 @@
}
compute_directory_stats(mount_point);
char tmp[PATH_MAX];
- sprintf(tmp, "%s/%s.img", backup_path, name);
+ scan_mounted_volumes();
+ Volume *v = volume_for_path(mount_point);
+ MountedVolume *mv = NULL;
+ if (v != NULL)
+ mv = find_mounted_volume_by_mount_point(v->mount_point);
+ if (mv == NULL || mv->filesystem == NULL)
+ sprintf(tmp, "%s/%s.auto", backup_path, name);
+ else
+ sprintf(tmp, "%s/%s.%s", backup_path, name, mv->filesystem);
nandroid_backup_handler backup_handler = get_backup_handler(mount_point);
if (backup_handler == NULL) {
ui_print("Error finding an appropriate backup handler.\n");
@@ -357,6 +367,7 @@
return tar_extract_wrapper;
}
+ // cwr 5, we prefer tar for everything unless it is yaffs2
char str[255];
char* partition;
property_get("ro.cwm.prefer_tar", str, "false");
@@ -374,37 +385,83 @@
int nandroid_restore_partition_extended(const char* backup_path, const char* mount_point, int umount_when_finished) {
int ret = 0;
char* name = basename(mount_point);
-
+
+ nandroid_restore_handler restore_handler = NULL;
+ const char *filesystems[] = { "yaffs2", "ext2", "ext3", "ext4", "vfat", NULL };
+ const char* backup_filesystem = NULL;
+ Volume *vol = volume_for_path(mount_point);
+ const char *device = NULL;
+ if (vol != NULL)
+ device = vol->device;
+
char tmp[PATH_MAX];
sprintf(tmp, "%s/%s.img", backup_path, name);
struct stat file_info;
if (0 != (ret = statfs(tmp, &file_info))) {
- ui_print("%s.img not found. Skipping restore of %s.\n", name, mount_point);
- return 0;
+ // can't find the backup, it may be the new backup format?
+ // iterate through the backup types
+ printf("couldn't find default\n");
+ char *filesystem;
+ int i = 0;
+ while ((filesystem = filesystems[i]) != NULL) {
+ sprintf(tmp, "%s/%s.%s.img", backup_path, name, filesystem);
+ if (0 == (ret = statfs(tmp, &file_info))) {
+ backup_filesystem = filesystem;
+ restore_handler = unyaffs_wrapper;
+ break;
+ }
+ sprintf(tmp, "%s/%s.%s.tar", backup_path, name, filesystem);
+ if (0 == (ret = statfs(tmp, &file_info))) {
+ backup_filesystem = filesystem;
+ restore_handler = tar_extract_wrapper;
+ break;
+ }
+ i++;
+ }
+
+ if (backup_filesystem == NULL || restore_handler == NULL) {
+ ui_print("%s.img not found. Skipping restore of %s.\n", name, mount_point);
+ return 0;
+ }
+ else {
+ printf("Found new backup image: %s\n", tmp);
+ }
+
+ // If the fs_type of this volume is "auto", let's revert to using a
+ // rm -rf, rather than trying to do a ext3/ext4/whatever format.
+ // This is because some phones (like DroidX) will freak out if you
+ // reformat the /system or /data partitions, and not boot due to
+ // a locked bootloader.
+ // The "auto" fs type preserves the file system, and does not
+ // trigger that lock.
+ // Or of volume does not exist (.android_secure), just rm -rf.
+ if (vol == NULL || 0 == strcmp(vol->fs_type, "auto"))
+ backup_filesystem = NULL;
}
ensure_directory(mount_point);
- int callback = stat("/sdcard/clockworkmod/.hidenandroidprogress", &file_info) == 0;
+ int callback = stat("/sdcard/clockworkmod/.hidenandroidprogress", &file_info) != 0;
ui_print("Restoring %s...\n", name);
- /*
- if (0 != (ret = ensure_root_path_unmounted(root))) {
- ui_print("Can't unmount %s!\n", mount_point);
- return ret;
+ if (backup_filesystem == NULL) {
+ if (0 != (ret = format_volume(mount_point))) {
+ ui_print("Error while formatting %s!\n", mount_point);
+ return ret;
+ }
}
- */
- if (0 != (ret = format_volume(mount_point))) {
+ else if (0 != (ret = format_device(device, mount_point, backup_filesystem))) {
ui_print("Error while formatting %s!\n", mount_point);
return ret;
}
-
+
if (0 != (ret = ensure_path_mounted(mount_point))) {
ui_print("Can't mount %s!\n", mount_point);
return ret;
}
-
- nandroid_restore_handler restore_handler = get_restore_handler(mount_point);
+
+ if (restore_handler == NULL)
+ restore_handler = get_restore_handler(mount_point);
if (restore_handler == NULL) {
ui_print("Error finding an appropriate restore handler.\n");
return -2;
diff --git a/ui.c b/ui.c
index d953562..2b9fb07 100644
--- a/ui.c
+++ b/ui.c
@@ -168,7 +168,8 @@
}
}
-#define MENU_TEXT_COLOR 255, 160, 49, 255
+//#define MENU_TEXT_COLOR 255, 160, 49, 255
+#define MENU_TEXT_COLOR 0, 191, 255, 255
#define NORMAL_TEXT_COLOR 200, 200, 200, 255
#define HEADER_TEXT_COLOR NORMAL_TEXT_COLOR