From 21b8a1230002fc9b2d673086838aed97a41cf7c5 Mon Sep 17 00:00:00 2001 From: IEF Date: Wed, 7 Mar 2012 16:50:26 +0100 Subject: [PATCH] Always call set_bootloader_message(), not just for MTD-devices. set_bootloader_message has a built-in check for MTD/eMMC via fstab. --- recovery.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/recovery.c b/recovery.c index 3fe7ae2..07fea5a 100644 --- a/recovery.c +++ b/recovery.c @@ -220,9 +220,7 @@ get_args(int *argc, char ***argv) { strlcat(boot.recovery, (*argv)[i], sizeof(boot.recovery)); strlcat(boot.recovery, "\n", sizeof(boot.recovery)); } - if (device_flash_type() == MTD) { - set_bootloader_message(&boot); - } + set_bootloader_message(&boot); } void @@ -284,12 +282,10 @@ finish_recovery(const char *send_intent) { copy_log_file(LAST_LOG_FILE, false); chmod(LAST_LOG_FILE, 0640); - if (device_flash_type() == MTD) { - // Reset to mormal system boot so recovery won't cycle indefinitely. - struct bootloader_message boot; - memset(&boot, 0, sizeof(boot)); - set_bootloader_message(&boot); - } + // Reset to normal system boot so recovery won't cycle indefinitely. + struct bootloader_message boot; + memset(&boot, 0, sizeof(boot)); + set_bootloader_message(&boot); // Remove the command file, so recovery won't repeat indefinitely. if (ensure_path_mounted(COMMAND_FILE) != 0 ||