From 9b0516c9fc993745cab983e9ada3e4b00185855c Mon Sep 17 00:00:00 2001 From: John Crispin Date: Mon, 17 Aug 2015 06:16:39 +0000 Subject: [PATCH] base-files: rework reset button script to indicate factory reset MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With this change we let user know 5 seconds have passed and reset button can be released (to trigger factory reset) Signed-off-by: Rafał Miłecki SVN-Revision: 46650 --- package/base-files/files/etc/rc.button/reset | 35 ++++++++++++-------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/package/base-files/files/etc/rc.button/reset b/package/base-files/files/etc/rc.button/reset index 3e241460ef..c6dc7cfbc0 100755 --- a/package/base-files/files/etc/rc.button/reset +++ b/package/base-files/files/etc/rc.button/reset @@ -1,20 +1,27 @@ #!/bin/sh -[ "${ACTION}" = "released" ] || exit 0 - . /lib/functions.sh -logger "$BUTTON pressed for $SEEN seconds" - -if [ "$SEEN" -lt 1 ] -then - echo "REBOOT" > /dev/console - sync - reboot -elif [ "$SEEN" -gt 5 ] -then - echo "FACTORY RESET" > /dev/console - jffs2reset -y && reboot & -fi +case "$ACTION" in +pressed) + return 5 +;; +timeout) + . /etc/diag.sh + set_state failsafe +;; +released) + if [ "$SEEN" -lt 1 ] + then + echo "REBOOT" > /dev/console + sync + reboot + elif [ "$SEEN" -gt 5 ] + then + echo "FACTORY RESET" > /dev/console + jffs2reset -y && reboot & + fi +;; +esac return 0