gwrx/openwrt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

base-files: Ensure reset only works if an overlay exists

Browse Source 
Currently the reset script will try to run jffs2reset on boards that are
running a rw rootfs, such as ext4. This will cause jffs2reset to fail
and the board to never reboot while the LED blinks until a manual
reboot.

This commit does two different things:
1. Disables reset on boards that do not have an overlay mount
2. Disables the Blinking LED after 5 seconds if the board does not
support reset

Signed-off-by: Chris Blake <chrisrblake93@gmail.com>
This commit is contained in:
Chris Blake 2016-10-24 13:13:15 -05:00 committed by John Crispin
parent 83ece71d63
commit b745bfa6dc
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/base-files/files/etc/rc.button/reset
View File

@ -2,8 +2,12 @@
. /lib/functions.sh . /lib/functions.sh
OVERLAY="$( grep ' /overlay ' /proc/mounts )"
case "$ACTION" in case "$ACTION" in
pressed) pressed)
[ -z "$OVERLAY" ] && return 0
return 5 return 5
;; ;;
timeout) timeout)
@ -16,7 +20,7 @@ released)
echo "REBOOT" > /dev/console echo "REBOOT" > /dev/console
sync sync
reboot reboot
elif [ "$SEEN" -gt 5 ] elif [ "$SEEN" -gt 5 -a -n "$OVERLAY" ]
then then
echo "FACTORY RESET" > /dev/console echo "FACTORY RESET" > /dev/console
jffs2reset -y && reboot & jffs2reset -y && reboot &