From 320c699689c5716ea90562cd7345e67b8322b712 Mon Sep 17 00:00:00 2001 From: Michel-FK Date: Tue, 13 Apr 2021 18:38:30 +0200 Subject: [PATCH] remove update file and reboot in normal mode when update file is corrupted Signed-off-by: Michel-FK --- Recovery/board/funkey/rootfs-overlay/etc/init.d/S60recovery | 4 ++-- Recovery/board/funkey/rootfs-overlay/usr/local/sbin/menu | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Recovery/board/funkey/rootfs-overlay/etc/init.d/S60recovery b/Recovery/board/funkey/rootfs-overlay/etc/init.d/S60recovery index a76f8df..c023ef2 100755 --- a/Recovery/board/funkey/rootfs-overlay/etc/init.d/S60recovery +++ b/Recovery/board/funkey/rootfs-overlay/etc/init.d/S60recovery @@ -18,8 +18,8 @@ case "$1" in for file in ${updates} ; do swupdate -i "${file}" if [ $? -ne 0 ]; then - menu & - exit 1 + notif_disp 10 " CORRUPTED^ UPDATE FILE" + rm -f "${file}" fi done notif "^^^^^^^^ RESTARTING...^^^^^^^^" diff --git a/Recovery/board/funkey/rootfs-overlay/usr/local/sbin/menu b/Recovery/board/funkey/rootfs-overlay/usr/local/sbin/menu index 88b8b89..c0571fd 100755 --- a/Recovery/board/funkey/rootfs-overlay/usr/local/sbin/menu +++ b/Recovery/board/funkey/rootfs-overlay/usr/local/sbin/menu @@ -139,8 +139,10 @@ menu_run () { for file in $(ls /mnt/FunKey-*.fwu); do swupdate -i "${file}" if [ $? -ne 0 ]; then - notif "${message}...^CANNOT UPDATE!" - break + notif_disp 10 "${message}...^ CORRUPTED^ UPDATE FILE" + rm -f "${file}" + notif "^^^^^^^^ RESTARTING...^^^^^^^^" + normal_mode fi done message=" USB MOUNT"