diff options
author | Doug Zongker <dougz@android.com> | 2010-09-22 05:01:51 +0200 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-22 05:01:51 +0200 |
commit | af78591c9a2aa8379c2d8528c31ea1eb813f6cae (patch) | |
tree | ee7e6f6f3e148f3264befc46015085497c2a13e2 | |
parent | am 93ca4fc6: use fs_type "emmc" instead of "block" for consistency (do not merge) (diff) | |
parent | Merge "mount sdcard only on demand; fix sideload installs" into gingerbread (diff) | |
download | android_bootable_recovery-af78591c9a2aa8379c2d8528c31ea1eb813f6cae.tar android_bootable_recovery-af78591c9a2aa8379c2d8528c31ea1eb813f6cae.tar.gz android_bootable_recovery-af78591c9a2aa8379c2d8528c31ea1eb813f6cae.tar.bz2 android_bootable_recovery-af78591c9a2aa8379c2d8528c31ea1eb813f6cae.tar.lz android_bootable_recovery-af78591c9a2aa8379c2d8528c31ea1eb813f6cae.tar.xz android_bootable_recovery-af78591c9a2aa8379c2d8528c31ea1eb813f6cae.tar.zst android_bootable_recovery-af78591c9a2aa8379c2d8528c31ea1eb813f6cae.zip |
-rw-r--r-- | recovery.c | 9 | ||||
-rw-r--r-- | roots.c | 20 |
2 files changed, 26 insertions, 3 deletions
diff --git a/recovery.c b/recovery.c index f5636d846..36da5f36a 100644 --- a/recovery.c +++ b/recovery.c @@ -456,6 +456,8 @@ static int compare_string(const void* a, const void* b) { static int sdcard_directory(const char* path) { + ensure_path_mounted(SDCARD_ROOT); + const char* MENU_HEADERS[] = { "Choose a package to install:", path, "", @@ -465,6 +467,7 @@ sdcard_directory(const char* path) { d = opendir(path); if (d == NULL) { LOGE("error opening %s: %s\n", path, strerror(errno)); + ensure_path_unmounted(SDCARD_ROOT); return 0; } @@ -546,11 +549,13 @@ sdcard_directory(const char* path) { // the status to the caller. char new_path[PATH_MAX]; strlcpy(new_path, path, PATH_MAX); + strlcat(new_path, "/", PATH_MAX); strlcat(new_path, item, PATH_MAX); ui_print("\n-- Install %s ...\n", path); set_sdcard_update_bootloader_message(); char* copy = copy_sideloaded_package(new_path); + ensure_path_unmounted(SDCARD_ROOT); if (copy) { result = install_package(copy); free(copy); @@ -566,6 +571,7 @@ sdcard_directory(const char* path) { free(zips); free(headers); + ensure_path_unmounted(SDCARD_ROOT); return result; } @@ -765,9 +771,6 @@ main(int argc, char **argv) { if (status != INSTALL_SUCCESS) ui_set_background(BACKGROUND_ICON_ERROR); if (status != INSTALL_SUCCESS || ui_text_visible()) { - // Mount the sdcard when the menu is enabled so you can "adb - // push" packages to the sdcard and immediately install them. - ensure_path_mounted(SDCARD_ROOT); prompt_and_wait(); } @@ -35,6 +35,13 @@ void load_volume_table() { int alloc = 2; device_volumes = malloc(alloc * sizeof(Volume)); + // Insert an entry for /tmp, which is the ramdisk and is always mounted. + device_volumes[0].mount_point = "/tmp"; + device_volumes[0].fs_type = "ramdisk"; + device_volumes[0].device = NULL; + device_volumes[0].device2 = NULL; + num_volumes = 1; + FILE* fstab = fopen("/etc/recovery.fstab", "r"); if (fstab == NULL) { LOGE("failed to open /etc/recovery.fstab (%s)\n", strerror(errno)); @@ -104,6 +111,10 @@ int ensure_path_mounted(const char* path) { LOGE("unknown volume for path [%s]\n", path); return -1; } + if (strcmp(v->fs_type, "ramdisk") == 0) { + // the ramdisk is always mounted. + return 0; + } int result; result = scan_mounted_volumes(); @@ -160,6 +171,10 @@ int ensure_path_unmounted(const char* path) { LOGE("unknown volume for path [%s]\n", path); return -1; } + if (strcmp(v->fs_type, "ramdisk") == 0) { + // the ramdisk is always mounted; you can't unmount it. + return -1; + } int result; result = scan_mounted_volumes(); @@ -184,6 +199,11 @@ int format_volume(const char* volume) { LOGE("unknown volume \"%s\"\n", volume); return -1; } + if (strcmp(v->fs_type, "ramdisk") == 0) { + // you can't format the ramdisk. + LOGE("can't format_volume \"%s\"", volume); + return -1; + } if (strcmp(v->mount_point, volume) != 0) { LOGE("can't give path \"%s\" to format_volume\n", volume); return -1; |