wip
diff --git a/recovery.c b/recovery.c
index d0dbe0b..2b3543e 100644
--- a/recovery.c
+++ b/recovery.c
@@ -24,7 +24,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <sys/reboot.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <time.h>
@@ -35,12 +34,12 @@
#include "bootloader.h"
#include "common.h"
#include "cutils/properties.h"
+#include "cutils/android_reboot.h"
#include "install.h"
#include "minui/minui.h"
#include "minzip/DirUtil.h"
#include "roots.h"
#include "recovery_ui.h"
-#include "encryptedfs_provisioning.h"
#include "extendedcommands.h"
#include "flashutils/flashutils.h"
@@ -50,7 +49,6 @@
{ "update_package", required_argument, NULL, 'u' },
{ "wipe_data", no_argument, NULL, 'w' },
{ "wipe_cache", no_argument, NULL, 'c' },
- { "set_encrypted_filesystems", required_argument, NULL, 'e' },
{ "show_text", no_argument, NULL, 't' },
{ NULL, 0, NULL, 0 },
};
@@ -59,6 +57,7 @@
static const char *INTENT_FILE = "/cache/recovery/intent";
static const char *LOG_FILE = "/cache/recovery/log";
static const char *LAST_LOG_FILE = "/cache/recovery/last_log";
+static const char *CACHE_ROOT = "/cache";
static const char *SDCARD_ROOT = "/sdcard";
static int allow_display_toggle = 1;
static int poweroff = 0;
@@ -66,6 +65,8 @@
static const char *TEMPORARY_LOG_FILE = "/tmp/recovery.log";
static const char *SIDELOAD_TEMP_DIR = "/tmp/sideload";
+extern UIParameters ui_parameters; // from ui.c
+
/*
* The recovery tool communicates with the main system through /cache files.
* /cache/recovery/command - INPUT - command line for tool, one arg per line
@@ -122,33 +123,13 @@
* 8g. finish_recovery() erases BCB
* -- after this, rebooting will (try to) restart the main system --
* 9. main() calls reboot() to boot main system
- *
- * SECURE FILE SYSTEMS ENABLE/DISABLE
- * 1. user selects "enable encrypted file systems"
- * 2. main system writes "--set_encrypted_filesystems=on|off" to
- * /cache/recovery/command
- * 3. main system reboots into recovery
- * 4. get_args() writes BCB with "boot-recovery" and
- * "--set_encrypted_filesystems=on|off"
- * -- after this, rebooting will restart the transition --
- * 5. read_encrypted_fs_info() retrieves encrypted file systems settings from /data
- * Settings include: property to specify the Encrypted FS istatus and
- * FS encryption key if enabled (not yet implemented)
- * 6. erase_volume() reformats /data
- * 7. erase_volume() reformats /cache
- * 8. restore_encrypted_fs_info() writes required encrypted file systems settings to /data
- * Settings include: property to specify the Encrypted FS status and
- * FS encryption key if enabled (not yet implemented)
- * 9. finish_recovery() erases BCB
- * -- after this, rebooting will restart the main system --
- * 10. main() calls reboot() to boot main system
*/
static const int MAX_ARG_LENGTH = 4096;
static const int MAX_ARGS = 100;
// open a given path, mounting partitions as necessary
-static FILE*
+FILE*
fopen_path(const char *path, const char *mode) {
if (ensure_path_mounted(path) != 0) {
LOGE("Can't mount %s\n", path);
@@ -467,6 +448,16 @@
int key = ui_wait_key();
int visible = ui_text_visible();
+ if (key == -1) { // ui_wait_key() timed out
+ if (ui_text_ever_visible()) {
+ continue;
+ } else {
+ LOGI("timed out waiting for key input; rebooting.\n");
+ ui_end_menu();
+ return ITEM_REBOOT;
+ }
+ }
+
int action = device_handle_key(key, visible);
int old_selected = selected;
@@ -525,8 +516,8 @@
}
static int
-sdcard_directory(const char* path) {
- ensure_path_mounted(SDCARD_ROOT);
+update_directory(const char* path, const char* unmount_when_done) {
+ ensure_path_mounted(path);
const char* MENU_HEADERS[] = { "Choose a package to install:",
path,
@@ -537,7 +528,9 @@
d = opendir(path);
if (d == NULL) {
LOGE("error opening %s: %s\n", path, strerror(errno));
- ensure_path_unmounted(SDCARD_ROOT);
+ if (unmount_when_done != NULL) {
+ ensure_path_unmounted(unmount_when_done);
+ }
return 0;
}
@@ -602,7 +595,7 @@
char* item = zips[chosen_item];
int item_len = strlen(item);
if (chosen_item == 0) { // item 0 is always "../"
- // go up but continue browsing (if the caller is sdcard_directory)
+ // go up but continue browsing (if the caller is update_directory)
result = -1;
break;
} else if (item[item_len-1] == '/') {
@@ -612,7 +605,7 @@
strlcat(new_path, "/", PATH_MAX);
strlcat(new_path, item, PATH_MAX);
new_path[strlen(new_path)-1] = '\0'; // truncate the trailing '/'
- result = sdcard_directory(new_path);
+ result = update_directory(new_path, unmount_when_done);
if (result >= 0) break;
} else {
// selected a zip file: attempt to install it, and return
@@ -625,7 +618,9 @@
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 (unmount_when_done != NULL) {
+ ensure_path_unmounted(unmount_when_done);
+ }
if (copy) {
result = install_package(copy);
free(copy);
@@ -641,7 +636,9 @@
free(zips);
free(headers);
- ensure_path_unmounted(SDCARD_ROOT);
+ if (unmount_when_done != NULL) {
+ ensure_path_unmounted(unmount_when_done);
+ }
return result;
}
@@ -706,6 +703,7 @@
// statement below.
chosen_item = device_perform_action(chosen_item);
+ int status;
switch (chosen_item) {
case ITEM_REBOOT:
poweroff=0;
@@ -727,34 +725,23 @@
break;
case ITEM_APPLY_SDCARD:
- if (confirm_selection("Confirm install?", "Yes - Install /sdcard/update.zip"))
- {
- ui_print("\n-- Install from sdcard...\n");
- int status = install_package(SDCARD_PACKAGE_FILE);
- if (status != INSTALL_SUCCESS) {
- ui_set_background(BACKGROUND_ICON_ERROR);
- ui_print("Installation aborted.\n");
- } else if (!ui_text_visible()) {
- return; // reboot if logs aren't visible
- } else {
- ui_print("\nInstall from sdcard complete.\n");
- }
- }
- break;
- case ITEM_INSTALL_ZIP:
show_install_update_menu();
break;
+
case ITEM_NANDROID:
show_nandroid_menu();
break;
+
case ITEM_PARTITION:
show_partition_menu();
break;
+
case ITEM_ADVANCED:
show_advanced_menu();
break;
+
case ITEM_POWEROFF:
- poweroff=1;
+ poweroff = 1;
return;
}
}
@@ -811,6 +798,7 @@
freopen(TEMPORARY_LOG_FILE, "a", stderr); setbuf(stderr, NULL);
printf("Starting recovery on %s", ctime(&start));
+ device_ui_init(&ui_parameters);
ui_init();
ui_print(EXPAND(RECOVERY_VERSION)"\n");
load_volume_table();
@@ -821,10 +809,7 @@
int previous_runs = 0;
const char *send_intent = NULL;
const char *update_package = NULL;
- const char *encrypted_fs_mode = NULL;
int wipe_data = 0, wipe_cache = 0;
- int toggle_secure_fs = 0;
- encrypted_fs_info encrypted_fs_data;
LOGI("Checking arguments.\n");
int arg;
@@ -839,7 +824,6 @@
#endif
break;
case 'c': wipe_cache = 1; break;
- case 'e': encrypted_fs_mode = optarg; toggle_secure_fs = 1; break;
case 't': ui_show_text(1); break;
case '?':
LOGE("Invalid command argument\n");
@@ -876,44 +860,8 @@
printf("\n");
int status = INSTALL_SUCCESS;
-
- if (toggle_secure_fs) {
- if (strcmp(encrypted_fs_mode,"on") == 0) {
- encrypted_fs_data.mode = MODE_ENCRYPTED_FS_ENABLED;
- ui_print("Enabling Encrypted FS.\n");
- } else if (strcmp(encrypted_fs_mode,"off") == 0) {
- encrypted_fs_data.mode = MODE_ENCRYPTED_FS_DISABLED;
- ui_print("Disabling Encrypted FS.\n");
- } else {
- ui_print("Error: invalid Encrypted FS setting.\n");
- status = INSTALL_ERROR;
- }
- // Recovery strategy: if the data partition is damaged, disable encrypted file systems.
- // This preventsthe device recycling endlessly in recovery mode.
- if ((encrypted_fs_data.mode == MODE_ENCRYPTED_FS_ENABLED) &&
- (read_encrypted_fs_info(&encrypted_fs_data))) {
- ui_print("Encrypted FS change aborted, resetting to disabled state.\n");
- encrypted_fs_data.mode = MODE_ENCRYPTED_FS_DISABLED;
- }
-
- if (status != INSTALL_ERROR) {
- if (erase_volume("/data")) {
- ui_print("Data wipe failed.\n");
- status = INSTALL_ERROR;
- } else if (erase_volume("/cache")) {
- ui_print("Cache wipe failed.\n");
- status = INSTALL_ERROR;
- } else if ((encrypted_fs_data.mode == MODE_ENCRYPTED_FS_ENABLED) &&
- (restore_encrypted_fs_info(&encrypted_fs_data))) {
- ui_print("Encrypted FS change aborted.\n");
- status = INSTALL_ERROR;
- } else {
- ui_print("Successfully updated Encrypted FS.\n");
- status = INSTALL_SUCCESS;
- }
- }
- } else if (update_package != NULL) {
+ if (update_package != NULL) {
status = install_package(update_package);
if (status != INSTALL_SUCCESS) ui_print("Installation aborted.\n");
} else if (wipe_data) {
@@ -960,12 +908,16 @@
// Otherwise, get ready to boot the main system...
finish_recovery(send_intent);
- if(!poweroff)
- ui_print("Rebooting...\n");
- else
- ui_print("Shutting down...\n");
+
sync();
- reboot((!poweroff) ? RB_AUTOBOOT : RB_POWER_OFF);
+ if(!poweroff) {
+ ui_print("Rebooting...\n");
+ android_reboot(ANDROID_RB_RESTART, 0, 0);
+ }
+ else {
+ ui_print("Shutting down...\n");
+ android_reboot(ANDROID_RB_POWEROFF, 0, 0);
+ }
return EXIT_SUCCESS;
}