summaryrefslogtreecommitdiffstats
path: root/install.c
diff options
context:
space:
mode:
authorDoug Zongker <dougz@android.com>2010-09-20 21:16:13 +0200
committerDoug Zongker <dougz@android.com>2010-09-21 23:13:45 +0200
commitcc8cd3f3cac07f6927ead277ef390c000ae798d9 (patch)
treeeb69079a188920538b1d955d0da5d594d934723f /install.c
parentam 3dba40da: (-s ours) am d4208f9f: remove the notion of "root path"; support mixed flash types (do not merge) (diff)
downloadandroid_bootable_recovery-cc8cd3f3cac07f6927ead277ef390c000ae798d9.tar
android_bootable_recovery-cc8cd3f3cac07f6927ead277ef390c000ae798d9.tar.gz
android_bootable_recovery-cc8cd3f3cac07f6927ead277ef390c000ae798d9.tar.bz2
android_bootable_recovery-cc8cd3f3cac07f6927ead277ef390c000ae798d9.tar.lz
android_bootable_recovery-cc8cd3f3cac07f6927ead277ef390c000ae798d9.tar.xz
android_bootable_recovery-cc8cd3f3cac07f6927ead277ef390c000ae798d9.tar.zst
android_bootable_recovery-cc8cd3f3cac07f6927ead277ef390c000ae798d9.zip
Diffstat (limited to 'install.c')
-rw-r--r--install.c15
1 files changed, 4 insertions, 11 deletions
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);