diff options
author | Doug Zongker <dougz@android.com> | 2010-09-21 20:34:39 +0200 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-21 20:34:39 +0200 |
commit | 3dba40da1e533c6f419857e4274d9d9dd55868b6 (patch) | |
tree | 17d142b0411f11fcfa3f060f622c0b2dd906577f /install.c | |
parent | am d7d42089: remove unneeded partition roots (diff) | |
parent | remove the notion of "root path"; support mixed flash types (do not merge) (diff) | |
download | android_bootable_recovery-3dba40da1e533c6f419857e4274d9d9dd55868b6.tar android_bootable_recovery-3dba40da1e533c6f419857e4274d9d9dd55868b6.tar.gz android_bootable_recovery-3dba40da1e533c6f419857e4274d9d9dd55868b6.tar.bz2 android_bootable_recovery-3dba40da1e533c6f419857e4274d9d9dd55868b6.tar.lz android_bootable_recovery-3dba40da1e533c6f419857e4274d9d9dd55868b6.tar.xz android_bootable_recovery-3dba40da1e533c6f419857e4274d9d9dd55868b6.tar.zst android_bootable_recovery-3dba40da1e533c6f419857e4274d9d9dd55868b6.zip |
Diffstat (limited to '')
-rw-r--r-- | install.c | 15 |
1 files changed, 4 insertions, 11 deletions
@@ -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); |