From f99ae2416265c2ff15de86b7ec6888d8f0c01929 Mon Sep 17 00:00:00 2001 From: Francisco Gil Martinez Date: Thu, 19 Mar 2020 09:27:10 +0100 Subject: [PATCH] recovery: allow the user to cancel the recovery process https://jira.digi.com/browse/DEL-6982 Signed-off-by: Francisco Gil Martinez --- .../recovery-utils/recovery-utils/lib/recovery.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/meta-digi-dey/recipes-core/recovery/recovery-utils/recovery-utils/lib/recovery.c b/meta-digi-dey/recipes-core/recovery/recovery-utils/recovery-utils/lib/recovery.c index 59b46a98d..40b5e2fb2 100644 --- a/meta-digi-dey/recipes-core/recovery/recovery-utils/recovery-utils/lib/recovery.c +++ b/meta-digi-dey/recipes-core/recovery/recovery-utils/recovery-utils/lib/recovery.c @@ -175,6 +175,12 @@ int reboot_recovery(unsigned int reboot_timeout) sync(); + printf("\nThe recovery commands have been properly configured and " + "the system will reboot into recovery mode in %d seconds " + "(^C to cancel).\n\n", reboot_timeout); + fflush(stdout); + sleep(reboot_timeout); + /* Configure system to boot into recovery mode */ ret = uboot_setenv("boot_recovery", "yes"); if (ret) { @@ -182,11 +188,6 @@ int reboot_recovery(unsigned int reboot_timeout) goto err; } - printf("\nThe recovery commands have been properly configured and " - "the system will reboot into recovery mode in %d seconds " - "(^C to cancel).\n\n", reboot_timeout); - fflush(stdout); - sleep(reboot_timeout); reboot(RB_AUTOBOOT); err: