From d4208f9f9d4e9f268ba1888c1fe879ee73eb7e47 Mon Sep 17 00:00:00 2001 From: Doug Zongker Date: Mon, 20 Sep 2010 12:16:13 -0700 Subject: remove the notion of "root path"; support mixed flash types (do not merge) Remove the wacky notion of "roots" and "root paths" (those things that look like "FOO:some/path" instead of just "/foo/some/path"). Let each device specify its own table of available partitions and how to mount them (needed for devices that use both MTD/yaffs2 and EMMC/ext4 partitions). Change-Id: I18b0a572a71c5e087e0b7ae11b1774388339bfd1 --- install.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'install.c') diff --git a/install.c b/install.c index a56dbd048..5bb3a78fa 100644 --- a/install.c +++ b/install.c @@ -234,26 +234,19 @@ exit: } int -install_package(const char *root_path) +install_package(const char *path) { ui_set_background(BACKGROUND_ICON_INSTALLING); ui_print("Finding update package...\n"); ui_show_indeterminate_progress(); - LOGI("Update location: %s\n", root_path); + LOGI("Update location: %s\n", path); - if (ensure_root_path_mounted(root_path) != 0) { - LOGE("Can't mount %s\n", root_path); - return INSTALL_CORRUPT; - } - - char path[PATH_MAX] = ""; - if (translate_root_path(root_path, path, sizeof(path)) == NULL) { - LOGE("Bad path %s\n", root_path); + if (ensure_path_mounted(path) != 0) { + LOGE("Can't mount %s\n", path); return INSTALL_CORRUPT; } ui_print("Opening update package...\n"); - LOGI("Update file path: %s\n", path); int numKeys; RSAPublicKey* loadedKeys = load_keys(PUBLIC_KEYS_FILE, &numKeys); -- cgit v1.2.3